From: William Lallemand <wlallemand@haproxy.org>
Date: Mon, 14 Feb 2022 08:02:14 +0000 (+0100)
Subject: BUG/MINOR: mworker: does not erase the pidfile upon reload
X-Git-Tag: v2.5.2~17
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=c468633a3ad12d33bf9bf3d7ac139b22bf0997bb;p=haproxy-2.5.git

BUG/MINOR: mworker: does not erase the pidfile upon reload

When started in master-worker mode combined with daemon mode, HAProxy
will open() with O_TRUNC the pidfile when switching to wait mode.

In 2.5, it happens  everytime after trying to load the configuration,
since we switch to wait mode.

In previous version this happens upon a failure of the configuration
loading.

Fixes bug #1545.

Must be backported in every supported branches.

(cherry picked from commit 7b820a6191736cdf4167d624b7bcab9957dd0697)
Signed-off-by: William Lallemand <wlallemand@haproxy.org>
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 5800a46..452129a 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3122,7 +3122,8 @@ int main(int argc, char **argv)
 	}
 
 	/* open log & pid files before the chroot */
-	if ((global.mode & MODE_DAEMON || global.mode & MODE_MWORKER) && global.pidfile != NULL) {
+	if ((global.mode & MODE_DAEMON || global.mode & MODE_MWORKER) &&
+	    !(global.mode & MODE_MWORKER_WAIT) && global.pidfile != NULL) {
 		unlink(global.pidfile);
 		pidfd = open(global.pidfile, O_CREAT | O_WRONLY | O_TRUNC, 0644);
 		if (pidfd < 0) {