From: Willy Tarreau <w@1wt.eu>
Date: Thu, 9 Mar 2023 10:39:51 +0000 (+0100)
Subject: BUG/MINOR: thread: report thread and group counts in the correct order
X-Git-Tag: v2.8-dev5~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf0d0eedc74736d83ff38856eabdd6121c2ee253;p=thirdparty%2Fhaproxy.git

BUG/MINOR: thread: report thread and group counts in the correct order

In case too many thread groups are needed for the threads, we emit
an error indicating the problem. Unfortunately the threads and groups
counts were reversed.

This can be backported to 2.6.
---

diff --git a/src/thread.c b/src/thread.c
index a00b3289f1..14ade8b4e7 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -1155,7 +1155,7 @@ int thread_map_to_groups()
 		q = ut / ug;
 		r = ut % ug;
 		if ((q + !!r) > MAX_THREADS_PER_GROUP) {
-			ha_alert("Too many remaining unassigned threads (%d) for thread groups (%d). Please increase thread-groups or make sure to keep thread numbers contiguous\n", ug, ut);
+			ha_alert("Too many remaining unassigned threads (%d) for thread groups (%d). Please increase thread-groups or make sure to keep thread numbers contiguous\n", ut, ug);
 			return -1;
 		}