From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Mon, 12 May 2025 09:57:39 +0000 (+0200)
Subject: BUG/MINOR: threads: fix soft-stop without multithreading support
X-Git-Tag: v3.2-dev16~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d057e56af86cdc98c5388986931c247dbafa5b3;p=thirdparty%2Fhaproxy.git

BUG/MINOR: threads: fix soft-stop without multithreading support

When thread support is disabled ("USE_THREAD=" or "USE_THREAD=0" when
building), soft-stop doesn't work as haproxy never ends after stopping
the proxies.

This used to work fine in the past but suddenly stopped working with
ef422ced91 ("MEDIUM: thread: make stopping_threads per-group and add
stopping_tgroups") because the "break;" instruction under the stopping
condition is never executed when support for multithreading is disabled.

To fix the issue, let's add an "else" block to run the "break;"
instruction when USE_THREAD is not defined.

It should be backported up to 2.8
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 658645ae8..c02b6981e 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2924,6 +2924,8 @@ void run_poll_loop()
 							wake_thread(i);
 					break;
 				}
+#else
+				break;
 #endif
 			}
 		}