From ab9a32d67d3cde5cd246c053627604bb32c1e99b Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Mon, 2 Jul 2018 16:17:53 +0200 Subject: [PATCH] Fix missing next check update causing the scheduler to execute checks too often Regression from #6217, only in git master. fixes #6421 --- lib/icinga/checkable-check.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp index 619e3c0ee..faf50694a 100644 --- a/lib/icinga/checkable-check.cpp +++ b/lib/icinga/checkable-check.cpp @@ -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(); {