]> granicus.if.org Git - icinga2/commitdiff
Fix missing next check update causing the scheduler to execute checks too often 6423/head
authorMichael Friedrich <michael.friedrich@icinga.com>
Mon, 2 Jul 2018 14:17:53 +0000 (16:17 +0200)
committerMichael Friedrich <michael.friedrich@icinga.com>
Mon, 2 Jul 2018 14:17:53 +0000 (16:17 +0200)
Regression from #6217, only in git master.

fixes #6421

lib/icinga/checkable-check.cpp

index 619e3c0eea86d38b841219581b741292c774597b..faf50694ab16e465e309ea3bb6dfe6ed84d4a427 100644 (file)
@@ -438,6 +438,12 @@ void Checkable::ExecuteCheck()
        double scheduled_start = GetNextCheck();
        double before_check = Utility::GetTime();
 
+       /* This calls SetNextCheck() which updates the CheckerComponent's idle/pending
+        * queues and ensures that checks are not fired multiple times. ProcessCheckResult()
+        * is called too late. See #6421.
+        */
+       UpdateNextCheck();
+
        bool reachable = IsReachable();
 
        {