From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Tue, 10 Aug 2021 14:21:55 +0000 (+0200)
Subject: BUG/MINOR: check: do not reset check flags on purge
X-Git-Tag: v2.5-dev4~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25fe1033cba2916f21d5ea3b4ccd6c74b56350e9;p=thirdparty%2Fhaproxy.git

BUG/MINOR: check: do not reset check flags on purge

Do not reset check flags when setting CHK_ST_PURGE.

Currently, this change has no impact. However, it is semantically wrong
to clear important flags such as CHK_ST_AGENT on purge.

Furthermore, this change will become mandatoy for a future fix to
properly free agent checks on dynamic servers removal. For this, it will
be needed to differentiate health/agent-check on purge via CHK_ST_AGENT
to properly free agent checks.

This must not be backported unless dynamic servers checks are
backported.
---

diff --git a/src/check.c b/src/check.c
index b1ffe5ecab..8ad32fe8f8 100644
--- a/src/check.c
+++ b/src/check.c
@@ -1363,7 +1363,7 @@ void free_check(struct check *check)
  */
 void check_purge(struct check *check)
 {
-	check->state = CHK_ST_PURGE;
+	check->state |= CHK_ST_PURGE;
 	task_wakeup(check->task, TASK_WOKEN_OTHER);
 }