From: Valentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Date: Tue, 29 Oct 2024 18:14:11 +0000 (+0100)
Subject: BUG/MINOR: startup: don't fork worker if started with -c -W
X-Git-Tag: v3.1-dev11~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1c6d44976d4b57862a85843887a4f775a6efb6c;p=thirdparty%2Fhaproxy.git

BUG/MINOR: startup: don't fork worker if started with -c -W

Don't do master-worker fork if MODE_CHECK is detected from the command line along
with the master-worker mode. We should exit in MODE_CHECK, after the
configuration parsing and validation. So, with the new master-worker architecture
it's better to align this mode with the standalone.

This patch does not need to be backported, as related to the latest
master-worker rework.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index bef1c46ca4..4bc6e4d038 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3150,6 +3150,12 @@ static void read_cfg_in_discovery_mode(int argc, char **argv)
 		ha_alert("a master CLI socket was defined, but master-worker mode (-W) is not enabled.\n");
 		exit(EXIT_FAILURE);
 	}
+
+	/* in MODE_CHECK and in MODE_DUMP_CFG we just need to parse the
+	 * configuration and exit, see step_init_2()
+	 */
+	if ((global.mode & MODE_MWORKER) && (global.mode & (MODE_CHECK | MODE_DUMP_CFG)))
+		global.mode &= ~MODE_MWORKER;
 }
 
 void deinit(void)