Refactor conditions and add debug log messages for future crs and skipped crs

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index 09fa901e12afa7ea767863adf1988c3b00d264dd..2437aa7871ba7248bf587b4c24b4556740cce90d 100644 (file)
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -170,9 +170,34 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
        long old_attempt = GetCheckAttempt();
        bool recovery = false;
 
-       /* Ignore check results older than the current one, except if the previous check result is from the future. */
-       if (old_cr && cr->GetExecutionStart() < old_cr->GetExecutionStart() && old_cr->GetExecutionStart() < now)
-               return;
+       /* When we have an check result already (not after fresh start),
+        * prevent to accept old check results and allow overrides for
+        * CRs happened in the future.
+        */
+       if (old_cr) {
+               double currentCRTimestamp = old_cr->GetExecutionStart();
+               double newCRTimestamp = cr->GetExecutionStart();
+
+               /* Our current timestamp may be from the future (wrong server time adjusted again). Allow overrides here. */
+               if (currentCRTimestamp > now) {
+                       /* our current CR is from the future, let the new CR override it. */
+                       Log(LogDebug, "Checkable")
+                               << std::fixed << std::setprecision(6) << "Processing check result for checkable '" << GetName() << "' from "
+                               << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", newCRTimestamp) << " (" << newCRTimestamp
+                               << "). Overriding since ours is from the future at "
+                               << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", currentCRTimestamp) << " (" << currentCRTimestamp << ").";
+               } else {
+                       /* Current timestamp is from the past, but the new timestamp is even more in the past. Skip it. */
+                       if (newCRTimestamp < currentCRTimestamp) {
+                               Log(LogDebug, "Checkable")
+                                       << std::fixed << std::setprecision(6) << "Skipping check result for checkable '" << GetName() << "' from "
+                                       << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", newCRTimestamp) << " (" << newCRTimestamp
+                                       << "). It is in the past compared to ours at "
+                                       << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", currentCRTimestamp) << " (" << currentCRTimestamp << ").";
+                               return;
+                       }
+               }
+       }
 
        /* The ExecuteCheck function already sets the old state, but we need to do it again
         * in case this was a passive check result. */