]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: threads: fix soft-stop without multithreading support
authorAurelien DARRAGON <adarragon@haproxy.com>
Mon, 12 May 2025 09:57:39 +0000 (11:57 +0200)
committerAurelien DARRAGON <adarragon@haproxy.com>
Mon, 12 May 2025 12:18:39 +0000 (14:18 +0200)
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

src/haproxy.c

index 658645ae8e7c4ec852a0048f85a110a7f45e49fe..c02b6981e03430e620924ac52f5477c3550bcebd 100644 (file)
@@ -2924,6 +2924,8 @@ void run_poll_loop()
                                                        wake_thread(i);
                                        break;
                                }
+#else
+                               break;
 #endif
                        }
                }