From: William Lallemand <wlallemand@haproxy.com>
Date: Tue, 11 Sep 2018 08:06:29 +0000 (+0200)
Subject: MEDIUM: mworker: call per_thread deinit in mworker_reload()
X-Git-Tag: v1.9-dev2~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=123f1f6441dfd42eaf704a115dcc671f194eb16a;p=thirdparty%2Fhaproxy.git

MEDIUM: mworker: call per_thread deinit in mworker_reload()

We need to clean the FDs registered manually in the poller to avoid FD
leaking during a reload of the master.

This patch call the per thread deinit function which close the thread
waker pipe.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index d5345baa50..b99334148e 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -740,8 +740,13 @@ static void mworker_reload()
 		next_argv[next_argc++] = NULL;
 	}
 
-	if (getenv("HAPROXY_MWORKER_WAIT_ONLY") == NULL)
+	if (getenv("HAPROXY_MWORKER_WAIT_ONLY") == NULL) {
+		struct per_thread_deinit_fct *ptdf;
+
+		list_for_each_entry(ptdf, &per_thread_deinit_list, list)
+			ptdf->fct();
 		deinit_pollers(); /* we don't want to leak the poller fd */
+	}
 
 	ha_warning("Reexecuting Master process\n");
 	execvp(next_argv[0], next_argv);