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

MEDIUM: mworker: master wait mode use its own initialization

Browse Source 
The master now use a poll loop, which should be initialized even in wait
mode. We need to init some variables if we didn't success to load the
configuration file.
This commit is contained in:
William Lallemand 2018-09-11 10:06:25 +02:00 committed by Willy Tarreau
parent de0ff5ab20
commit f9cc07c25b
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/haproxy.c
View File

@ -770,6 +770,8 @@ static void mworker_loop()
mworker_unblock_signals(); mworker_unblock_signals();
mworker_cleanlisteners(); mworker_cleanlisteners();
tid = 0;
global.nbthread = 1; global.nbthread = 1;
relative_pid = 1; relative_pid = 1;
pid_bit = 1; pid_bit = 1;
@ -782,6 +784,40 @@ static void mworker_loop()
run_thread_poll_loop((int []){0}); run_thread_poll_loop((int []){0});
} }
/*
* This function initialize haproxy for the master wait mode, it won't fork any
* new process and won't parse the configuration
*/
static int mworker_wait_mode()
{
global.maxsock = 10; /* reserve 10 fds ; will be incremented by socket eaters */
if (!(global.tune.options & GTUNE_USE_KQUEUE))
disable_poller("kqueue");
if (!(global.tune.options & GTUNE_USE_EPOLL))
disable_poller("epoll");
if (!(global.tune.options & GTUNE_USE_POLL))
disable_poller("poll");
if (!(global.tune.options & GTUNE_USE_SELECT))
disable_poller("select");
if (global.tune.maxpollevents <= 0)
global.tune.maxpollevents = MAX_POLL_EVENTS;
init_pollers();
mworker_loop();
/* should never be there */
return -1;
}
/* /*
* Reexec the process in failure mode, instead of exiting * Reexec the process in failure mode, instead of exiting
*/ */
@ -1517,7 +1553,7 @@ static void init(int argc, char **argv)
if ((global.mode & MODE_MWORKER) && (getenv("HAPROXY_MWORKER_WAIT_ONLY") != NULL)) { if ((global.mode & MODE_MWORKER) && (getenv("HAPROXY_MWORKER_WAIT_ONLY") != NULL)) {
unsetenv("HAPROXY_MWORKER_WAIT_ONLY"); unsetenv("HAPROXY_MWORKER_WAIT_ONLY");
mworker_loop(); mworker_wait_mode();
} }
if ((global.mode & MODE_MWORKER) && (getenv("HAPROXY_MWORKER_REEXEC") != NULL)) { if ((global.mode & MODE_MWORKER) && (getenv("HAPROXY_MWORKER_REEXEC") != NULL)) {