]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: check: do not reset check flags on purge
authorAmaury Denoyelle <adenoyelle@haproxy.com>
Tue, 10 Aug 2021 14:21:55 +0000 (16:21 +0200)
committerAmaury Denoyelle <adenoyelle@haproxy.com>
Wed, 11 Aug 2021 12:33:34 +0000 (14:33 +0200)
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.

src/check.c

index b1ffe5ecabf5fb3c187827f4de7484cfb57243c4..8ad32fe8f81b99034f9c455407e20d32fade32ff 100644 (file)
@@ -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);
 }