Merge pull request #2419 from pqarmitage/updates

pqarmitage · web-flow · commit 5ac98198b240 · 2024-05-25T15:48:58.000+01:00
ipvs: Update status code of misc checker if changes while in fault state
diff --git a/keepalived/check/check_misc.c b/keepalived/check/check_misc.c
@@ -403,7 +403,8 @@ misc_check_child_thread(thread_ref_t thread)
 				checker->cur_weight = 0;
 				misck_checker->last_exit_code = status;
 			}
-		}
+		} else	//  if (status != misck_checker->last_exit_code)
+			misck_checker->last_exit_code = status;
 	}
 	else if (WIFSIGNALED(wait_status)) {
 		if (misck_checker->state == SCRIPT_STATE_REQUESTING_TERMINATION && WTERMSIG(wait_status) == SIGTERM) {

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,8 @@ misc_check_child_thread(thread_ref_t thread)`
`403`	`403`	`checker->cur_weight = 0;`
`404`	`404`	`misck_checker->last_exit_code = status;`
`405`	`405`	`}`
`406`		`- }`
	`406`	`+ } else // if (status != misck_checker->last_exit_code)`
	`407`	`+ misck_checker->last_exit_code = status;`
`407`	`408`	`}`
`408`	`409`	`else if (WIFSIGNALED(wait_status)) {`
`409`	`410`	`if (misck_checker->state == SCRIPT_STATE_REQUESTING_TERMINATION && WTERMSIG(wait_status) == SIGTERM) {`