[icinga-checkins] icinga.org: icinga-core/master: core: fix host_check, last_check == next_check wrong in scheduling queue

git at icinga.org git at icinga.org
Thu Mar 21 17:12:37 CET 2013


Module: icinga-core
Branch: master
Commit: 5074e8d9302134d0e089d43015616fe07492b86f
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=5074e8d9302134d0e089d43015616fe07492b86f

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Sun Mar 10 14:30:46 2013 +0100

core: fix host_check, last_check == next_check wrong in scheduling queue

this is one of those side effects when detecting orphaned checks, so in
order to solve the issue, remove workaround for the next_check of on
demand hosts, and look our if they occur on the orphaned checks again.

fixes #2195

---

 Changelog     |    1 +
 base/checks.c |    5 -----
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index 3b9eb34..4db045b 100644
--- a/Changelog
+++ b/Changelog
@@ -39,6 +39,7 @@ FIXES
 * core: fix wrong escalation notification due to state based escalation range behaviour changes #3441 - MF
 * core: change ownership of debug log file before dropping privileges (Eric Stanley) #3521 - MF
 * core: fix keep_unknown_macros still exposes wrong warnings to logs #3725 - MF
+* core: fix host_check, last_check == next_check wrong in scheduling queue #2195 - MF
 
 * idoutils: fix many memory leaks in ido2db on dbi_result_free and others (thx Klaus Wagner) #3406 - MF
 * idoutils: fix ido2db crashes when Oracle queries fail #3324 - GB
diff --git a/base/checks.c b/base/checks.c
index fbc6d1e..11e8764 100644
--- a/base/checks.c
+++ b/base/checks.c
@@ -3239,11 +3239,6 @@ int run_async_host_check_3x(host *hst, int check_options, double latency, int sc
 	/* get the command start time */
 	gettimeofday(&start_time, NULL);
 
-	/* set check time for on-demand checks, so they're not incorrectly detected as being orphaned - Luke Ross 5/16/08 */
-	/* NOTE: 06/23/08 EG not sure if there will be side effects to this or not.... */
-	if (scheduled_check == FALSE)
-		hst->next_check = start_time.tv_sec;
-
 	/* increment number of host checks that are currently running... */
 	currently_running_host_checks++;
 





More information about the icinga-checkins mailing list