From: Michael Friedrich <michael.friedrich@netways.de>
Date: Sat, 5 Mar 2016 16:55:14 +0000 (+0100)
Subject: Revert "Fix check scheduling w/ retry_interval"
X-Git-Tag: v2.5.0~494
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef532f20eb4c168dc532d7f9532d88409a821902;p=icinga2

Revert "Fix check scheduling w/ retry_interval"

This reverts commit a51e647cc760bd5f7c4de6182961a477478c11a9.

This patch causes trouble with check results received
1) passively 2) throughout the cluster. A proper patch
for setting the retry_interval on NOT-OK state changes
is required.

refs #11248
refs #11257
refs #11273

(the old issue)
refs #7287
---

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index 9916093de..398b8dfbe 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -302,9 +302,6 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
 		UpdateFlappingStatus(stateChange);
 	is_flapping = IsFlapping();
 
-	/* update next check time on possible state changes */
-	UpdateNextCheck();
-
 	olock.Unlock();
 
 //	Log(LogDebug, "Checkable")