upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-02-20 00:10:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

MINOR: mworker-prog: stop old programs in mworker_ext_launch_all

Browse source 
This patch is a part of series to reintroduce the program support in the new
master-worker architecture.

Now, after refactoring in master-worker mode it's the master process, who
stops workers forked before the reload. Current worker no longer sends USR1 or
TERM signals to the previous one after ports binding. This behaviour is kept
only for the standalone mode.

So, in case of programs, it's up to master process as well to stop programs,
which were launched before reload. Let's do this in mworker_ext_launch_all(),
just before starting the new programs.
This commit is contained in:
Valentine Krasnobaeva 2024-10-10 23:50:39 +02:00 committed by Willy Tarreau
parent 0fc2ff4b7d
commit 9e23cfa5c2
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mworker-prog.c
View file

@ -49,6 +49,10 @@ int mworker_ext_launch_all()
/* find the right mworker_proc */
list_for_each_entry_safe(child, tmp, &proc_list, list) {
/* need to stop progs, which were launched before reload */
if ((child->options & PROC_O_TYPE_PROG) && (child->options & PROC_O_LEAVING))
kill(child->pid, oldpids_sig);
if (child->reloads == 0 && (child->options & PROC_O_TYPE_PROG)) {
if (reexec && (!(child->options & PROC_O_START_RELOAD))) {