RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-12 00:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: mworker: segfault receiving SIGUSR1 followed by SIGTERM.

Browse Source 
This bug appeared only if nbthread > 1. Handling the pipe with the
master, multiple threads of the same worker could process the deinit().

In addition, deinit() was called while some other threads were still
performing some tasks.

This patch assign the handler of the pipe with master to only the first
thread and removes the call to deinit() before exiting with an error.

This patch should be backported in v1.8.
This commit is contained in:
Emeric Brun 2018-10-11 15:27:07 +02:00 committed by Willy Tarreau
parent dddfe31265
commit c8c0ed91cb
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/haproxy.c
View File

@ -2483,7 +2483,13 @@ void mworker_pipe_handler(int fd)
break;
}
deinit();
/* At this step the master is down before
* this worker perform a 'normal' exit.
* So we want to exit with an error but
* other threads could currently process
* some stuff so we can't perform a clean
* deinit().
*/
exit(EXIT_FAILURE);
return;
}
@ -2496,7 +2502,10 @@ void mworker_pipe_register()
return;
fcntl(proc_self->ipc_fd[1], F_SETFL, O_NONBLOCK);
fd_insert(proc_self->ipc_fd[1], proc_self->ipc_fd, mworker_pipe_handler, MAX_THREADS_MASK);
/* In multi-tread, we need only one thread to process
* events on the pipe with master
*/
fd_insert(proc_self->ipc_fd[1], proc_self->ipc_fd, mworker_pipe_handler, 1);
fd_want_recv(proc_self->ipc_fd[1]);
}