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

MEDIUM: mworker: exit-on-failure option

Browse Source 
This option exits every workers when one of the current workers die.

It allows you to monitor the master process in order to relaunch
everything on a failure.

For example it can be used with systemd and Restart=on-failure in a spec
file.
This commit is contained in:
William Lallemand 2017-06-01 17:38:54 +02:00 committed by Willy Tarreau
parent 85b0bd9e54
commit 69f9b3bfa4
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/global.h
View File

@ -63,6 +63,7 @@
#define GTUNE_RESOLVE_DONTFAIL (1<<7) #define GTUNE_RESOLVE_DONTFAIL (1<<7)
#define GTUNE_SOCKET_TRANSFER (1<<8) #define GTUNE_SOCKET_TRANSFER (1<<8)
#define GTUNE_EXIT_ONFAILURE (1<<9)
/* Access level for a stats socket */ /* Access level for a stats socket */
#define ACCESS_LVL_NONE 0 #define ACCESS_LVL_NONE 0

11
src/cfgparse.c
View File

@ -625,8 +625,17 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
global.mode |= MODE_DAEMON; global.mode |= MODE_DAEMON;
} }
else if (!strcmp(args[0], "master-worker")) { else if (!strcmp(args[0], "master-worker")) {
if (alertif_too_many_args(0, file, linenum, args, &err_code)) if (alertif_too_many_args(1, file, linenum, args, &err_code))
goto out; goto out;
if (*args[1]) {
if (!strcmp(args[1], "exit-on-failure")) {
global.tune.options |= GTUNE_EXIT_ONFAILURE;
} else {
Alert("parsing [%s:%d] : '%s' only supports 'exit-on-failure' option.\n", file, linenum, args[0]);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
}
global.mode |= MODE_MWORKER; global.mode |= MODE_MWORKER;
} }
else if (!strcmp(args[0], "debug")) { else if (!strcmp(args[0], "debug")) {

5
src/haproxy.c
View File

@ -671,6 +671,11 @@ static void mworker_wait()
/* check if exited child was in the current children list */ /* check if exited child was in the current children list */
if (current_child(exitpid)) { if (current_child(exitpid)) {
Alert("Current worker %d left with exit code %d\n", exitpid, status); Alert("Current worker %d left with exit code %d\n", exitpid, status);
if (status != 0 && status != 130 && status != 143
&& global.tune.options & GTUNE_EXIT_ONFAILURE) {
Alert("exit-on-failure: killing every workers with SIGTERM\n");
mworker_kill(SIGTERM);
}
} else { } else {
Warning("Former worker %d left with exit code %d\n", exitpid, status); Warning("Former worker %d left with exit code %d\n", exitpid, status);
delete_oldpid(exitpid); delete_oldpid(exitpid);