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

MINOR: mworker: change the way we set PROC_O_LEAVING

Browse Source 
Since the wait mode is always used once we successfuly loaded the
configuration, every processes were marked as old workers.

To fix this, the PROC_O_LEAVING flag is set only on the processes which
have a number of reloads greater than the current processes.
This commit is contained in:
William Lallemand 2021-11-10 11:26:14 +01:00
parent 3ba7c7b5e1
commit 90034bba15
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mworker.c
View File

@ -134,13 +134,14 @@ void mworker_proc_list_to_env()
int mworker_env_to_proc_list() int mworker_env_to_proc_list()
{ {
char *msg, *token = NULL, *s1; char *msg, *token = NULL, *s1;
struct mworker_proc *child;
int minreloads = INT_MAX; /* minimum number of reloads to chose which processes are "current" ones */
msg = getenv("HAPROXY_PROCESSES"); msg = getenv("HAPROXY_PROCESSES");
if (!msg) if (!msg)
return 0; return 0;
while ((token = strtok_r(msg, "|", &s1))) { while ((token = strtok_r(msg, "|", &s1))) {
struct mworker_proc *child;
char *subtoken = NULL; char *subtoken = NULL;
char *s2; char *s2;
@ -176,6 +177,9 @@ int mworker_env_to_proc_list()
} else if (strncmp(subtoken, "reloads=", 8) == 0) { } else if (strncmp(subtoken, "reloads=", 8) == 0) {
/* we only increment the number of asked reload */ /* we only increment the number of asked reload */
child->reloads = atoi(subtoken+8); child->reloads = atoi(subtoken+8);
if (child->reloads < minreloads)
minreloads = child->reloads;
} else if (strncmp(subtoken, "failedreloads=", 14) == 0) { } else if (strncmp(subtoken, "failedreloads=", 14) == 0) {
child->failedreloads = atoi(subtoken+14); child->failedreloads = atoi(subtoken+14);
} else if (strncmp(subtoken, "timestamp=", 10) == 0) { } else if (strncmp(subtoken, "timestamp=", 10) == 0) {
@ -187,15 +191,19 @@ int mworker_env_to_proc_list()
} }
} }
if (child->pid) { if (child->pid) {
/* this is a process inherited from a reload that should be leaving */
child->options |= PROC_O_LEAVING;
LIST_APPEND(&proc_list, &child->list); LIST_APPEND(&proc_list, &child->list);
} else { } else {
mworker_free_child(child); mworker_free_child(child);
} }
} }
/* set the leaving processes once we know which number of reloads are the current processes */
list_for_each_entry(child, &proc_list, list) {
if (child->reloads > minreloads)
child->options |= PROC_O_LEAVING;
}
unsetenv("HAPROXY_PROCESSES"); unsetenv("HAPROXY_PROCESSES");
return 0; return 0;