RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-04 04:22:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: systemd-wrapper: don't leak zombie processes

Browse Source 
Formerly, if A was replaced by B, and then B by C before
A finished exiting, we didn't wait for B to finish so it
ended up as a zombie process.
Fix this by waiting randomly every child we spawn.

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
This commit is contained in:
Marc-Antoine Perennou 2013-04-02 13:53:21 +02:00 committed by Willy Tarreau
parent a890d072fc
commit 47f922dd24
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/haproxy-systemd-wrapper.c
View File

@ -19,12 +19,11 @@
#include <unistd.h> #include <unistd.h>
#include <sys/wait.h> #include <sys/wait.h>
static pid_t pid = 0;
static char *pid_file = "/run/haproxy.pid"; static char *pid_file = "/run/haproxy.pid";
static int main_argc; static int main_argc;
static char **main_argv; static char **main_argv;
static pid_t spawn_haproxy(char **pid_strv, int nb_pid) static void spawn_haproxy(char **pid_strv, int nb_pid)
{ {
pid_t pid = fork(); pid_t pid = fork();
if (!pid) { if (!pid) {
@ -45,7 +44,6 @@ static pid_t spawn_haproxy(char **pid_strv, int nb_pid)
execv(argv[0], argv); execv(argv[0], argv);
exit(0); exit(0);
} }
return pid;
} }
static int read_pids(char ***pid_strv) static int read_pids(char ***pid_strv)
@ -77,7 +75,7 @@ static void signal_handler(int signum __attribute__((unused)))
char **pid_strv = NULL; char **pid_strv = NULL;
int nb_pid = read_pids(&pid_strv); int nb_pid = read_pids(&pid_strv);
pid = spawn_haproxy(pid_strv, nb_pid); spawn_haproxy(pid_strv, nb_pid);
for (i = 0; i < nb_pid; ++i) for (i = 0; i < nb_pid; ++i)
free(pid_strv[i]); free(pid_strv[i]);
@ -107,8 +105,8 @@ int main(int argc, char **argv)
signal(SIGUSR2, &signal_handler); signal(SIGUSR2, &signal_handler);
pid = spawn_haproxy(NULL, 0); spawn_haproxy(NULL, 0);
while (-1 != waitpid(pid, NULL, 0) || errno == EINTR); while (-1 != wait(NULL) || errno == EINTR);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }