From: William Lallemand <wlallemand@haproxy.com>
Date: Tue, 20 Jun 2017 09:20:33 +0000 (+0200)
Subject: BUG/MEDIUM: mworker: don't reuse PIDs passed to the master
X-Git-Tag: v1.8-dev3~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a361b5;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: mworker: don't reuse PIDs passed to the master

When starting the master worker with -sf or -st, the PIDs will be reused
on the next reload, which is a problem if new processes on the system
took those PIDs.

This patch ensures that we don't register old PIDs in the reload system
when launching the master worker.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index cdb6066b5a..a425744334 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2444,6 +2444,13 @@ int main(int argc, char **argv)
 	if (nb_oldpids)
 		nb_oldpids = tell_old_pids(oldpids_sig);
 
+	if ((getenv("HAPROXY_MWORKER_REEXEC") == NULL)) {
+		nb_oldpids = 0;
+		free(oldpids);
+		oldpids = NULL;
+	}
+
+
 	/* Note that any error at this stage will be fatal because we will not
 	 * be able to restart the old pids.
 	 */