mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: master/cli: Properly pin the master CLI on thread 1 / group 1

Browse Source 
A previous fix was pushed for that (13fb7170be "BUG/MEDIUM: master/cli: Pin
the master CLI on the first thread of the group 1" ). Unfortunately, instead
of the master CLI, it is the sockpairs between the master and the workers
that were pinned to the first thread of the group 1. So the crash is still
there.

So, again, to fix the bug the master CLI is now pinned on the first thread
of the first group.

 patch should fix the issue #2259 and must be backported to 2.8.
This commit is contained in:
Christopher Faulet 2023-11-28 21:50:21 +01:00
parent d3cbd36950
commit a053512a7f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cli.c
View File

@ -3229,6 +3229,9 @@ struct bind_conf *mworker_cli_proxy_new_listener(char *line)
bind_conf->nice = -64; /* we want to boost priority for local stats */
bind_conf->options |= BC_O_UNLIMITED; /* don't make the peers subject to global limits */
/* Pin master CLI on the first thread of the first group only */
thread_set_pin_grp1(&bind_conf->thread_set, 1);
list_for_each_entry(l, &bind_conf->listeners, by_bind) {
l->rx.flags |= RX_F_MWORKER; /* we are keeping this FD in the master */
global.maxsock++; /* for the listening socket */