From: Willy Tarreau <w@1wt.eu>
Date: Thu, 18 Apr 2019 09:31:36 +0000 (+0200)
Subject: BUG/MINOR: mworker: disable busy polling in the master process
X-Git-Tag: v2.0-dev3~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d83b6c1ab3d36ab522892675c8d5f9072c1fd3ef;p=thirdparty%2Fhaproxy.git

BUG/MINOR: mworker: disable busy polling in the master process

When enabling busy polling, we don't want the master to use it, or it
wastes a dedicated processor to this!

Must be backported to 1.9.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 3477ca54e4..fb6481b78a 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -650,6 +650,8 @@ static void mworker_loop()
 	if (global.tune.options & GTUNE_USE_SYSTEMD)
 		sd_notifyf(0, "READY=1\nMAINPID=%lu", (unsigned long)getpid());
 #endif
+	/* Busy polling makes no sense in the master :-) */
+	global.tune.options &= ~GTUNE_BUSY_POLLING;
 
 	master = 1;