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

MEDIUM: startup: move daemonization fork in init

Browse Source 
Let's move daemonization fork in init(). We need to perform this fork always
before forking a worker process, in order to be able to launch master and then
its worker in daemon, i.e. background mode, if haproxy was started with '-D'
option.

This refactoring is a preparation step, needed for replacing then master-worker
fork in init() as well. This allows the master process not to read the whole
configuration file and not to do re-execution in order to free additional
memory, when worker was forked. In the new refactored design only the worker
process will read and apply a new configuration, while the master will arrive
very fast in its polling loop to wait worker's termination and to handle
signals. See more details in the following commits.
This commit is contained in:
Valentine Krasnobaeva 2024-06-28 18:06:52 +02:00 committed by Willy Tarreau
parent df12791da3
commit 90b8181c0a
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/haproxy.c
View File

@ -2115,6 +2115,22 @@ static void init(int argc, char **argv)
global.nbthread = 1; global.nbthread = 1;
} }
/* if daemon + mworker: must fork here to let a master process live in
* background before forking children.
*/
if ((getenv("HAPROXY_MWORKER_REEXEC") == NULL) &&
(global.mode & MODE_DAEMON)) {
ret = fork();
if (ret < 0) {
ha_alert("[%s.main()] Cannot fork.\n", argv[0]);
protocol_unbind_all();
exit(1); /* there has been an error */
} else if (ret > 0) { /* parent leave to daemonize */
exit(0);
} else /* change the process group ID in the child (master process) */
setsid();
}
if (global.mode & (MODE_MWORKER|MODE_MWORKER_WAIT)) if (global.mode & (MODE_MWORKER|MODE_MWORKER_WAIT))
mworker_create_master_cli(); mworker_create_master_cli();
@ -3528,26 +3544,6 @@ int main(int argc, char **argv)
int in_parent = 0; int in_parent = 0;
int devnullfd = -1; int devnullfd = -1;
/*
* if daemon + mworker: must fork here to let a master
* process live in background before forking children
*/
if ((getenv("HAPROXY_MWORKER_REEXEC") == NULL)
&& (global.mode & MODE_MWORKER)
&& (global.mode & MODE_DAEMON)) {
ret = fork();
if (ret < 0) {
ha_alert("[%s.main()] Cannot fork.\n", argv[0]);
protocol_unbind_all();
exit(1); /* there has been an error */
} else if (ret > 0) { /* parent leave to daemonize */
exit(0);
} else /* change the process group ID in the child (master process) */
setsid();
}
/* if in master-worker mode, write the PID of the father */ /* if in master-worker mode, write the PID of the father */
if (global.mode & MODE_MWORKER) { if (global.mode & MODE_MWORKER) {
char pidstr[100]; char pidstr[100];