Merge pull request #758 from sawolf/757-hard-recover-on-last-attempt

Sebastian Wolf · web-flow · commit e402d9be37bf · 2020-04-28T10:21:38.000-05:00
Fix hard recovery on final check attempt
diff --git a/Changelog b/Changelog
@@ -11,6 +11,7 @@ FIXES
 * Fixed build process when using GCC 10 (#721) (Michael Orlitzky)
 * Fixed postauth vulnerabilities in histogram.js, map.js, trends.js (CVE-2020-1408) (Thanks UraSec Team) (Sebastian Wolf)
 * When using systemd, configuration will be verified before reloading (#715) (tatref)
+* Fixed HARD OK states triggering on the maximum check attempt (#757) (Sebastian Wolf)
 
 4.4.5 - 2019-08-20
 ------------------
diff --git a/base/checks.c b/base/checks.c
@@ -1490,7 +1490,7 @@ int handle_async_service_check_result(service *svc, check_result *cr)
 	}
 
 	if (svc->current_attempt >= svc->max_attempts &&
-		(svc->current_state != new_last_hard_state || svc->state_type == SOFT_STATE)) {
+		(svc->current_state != new_last_hard_state || (svc->state_type == SOFT_STATE && svc->current_state != STATE_OK))) {
 
 		log_debug_info(DEBUGL_CHECKS, 2, "Service had a HARD STATE CHANGE!!\n");
         

Original file line number	Diff line number	Diff line change
`@@ -1490,7 +1490,7 @@ int handle_async_service_check_result(service svc, check_result cr)`
`1490`	`1490`	`}`
`1491`	`1491`
`1492`	`1492`	`if (svc->current_attempt >= svc->max_attempts &&`
`1493`		`- (svc->current_state != new_last_hard_state \|\| svc->state_type == SOFT_STATE)) {`
	`1493`	`+ (svc->current_state != new_last_hard_state \|\| (svc->state_type == SOFT_STATE && svc->current_state != STATE_OK))) {`
`1494`	`1494`
`1495`	`1495`	`log_debug_info(DEBUGL_CHECKS, 2, "Service had a HARD STATE CHANGE!!\n");`
`1496`	`1496`