From d83b6c1ab3d36ab522892675c8d5f9072c1fd3ef Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 18 Apr 2019 11:31:36 +0200 Subject: [PATCH] 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. --- src/haproxy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/haproxy.c b/src/haproxy.c index 3477ca54e..fb6481b78 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; -- 2.47.3