mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: haproxy: rm no longer used mworker_reexec_waitmode

Browse Source 
This a first commit to prepare the removal of MODE_MWORKER_WAIT support. It has
became redundant with MODE_MWORKER, due to moving master-worker fork in init().
Master process does no longer perform reexec to free additional memory after
forking and does no longer changing its mode to MODE_MWORKER_WAIT, where it has
entered to its wait polling loop and has handled signals. Now, master enters in
this loop almost immediately after forking a worker and being always in mode
MODE_MWORKER.

So, we can remove mworker_reexec_waitmode() wrapper, which was used to set
HAPROXY_MWORKER_WAIT_ONLY variable and to call mworker_reexec(). But let's keep
for the moment the logic of reexec_on_failure() atexit callback for master in
order if in the future we will need to support this case again.
This commit is contained in:
Valentine Krasnobaeva 2024-07-09 13:59:12 +02:00 committed by Willy Tarreau
parent cb0f1f42e1
commit 7795d49ae6
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/haproxy.c
View File

@ -828,13 +828,6 @@ static void mworker_reexec(int hardreload)
return;
}
/* reexec haproxy in waitmode */
static void mworker_reexec_waitmode()
{
setenv("HAPROXY_MWORKER_WAIT_ONLY", "1", 1);
mworker_reexec(0);
}
/* reload haproxy and emit a warning */
void mworker_reload(int hardreload)
{
@ -937,7 +930,7 @@ void reexec_on_failure()
sd_notify(0, "READY=1\nSTATUS=Reload failed!\n");
#endif
mworker_reexec_waitmode();
mworker_reexec(0);
}
/*