mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 06:40:59 +01:00
Code Issues Projects Releases Wiki Activity

MEDIUM: config: initialize stick-tables after peers, not before

Browse Source 
It's dangerous to initialize stick-tables before peers because they
start a task that cannot be stopped before we know if the peers need
to be disabled and destroyed. Move this after.
This commit is contained in:
Willy Tarreau 2015-05-01 19:09:08 +02:00
parent c8b679180d
commit 6866f3f33f
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/cfgparse.c
View File

@ -7871,20 +7871,6 @@ out_uri_auth_compat:
} }
} }
/* initialize stick-tables on backend capable proxies. This must not
* be done earlier because the data size may be discovered while parsing
* other proxies.
*/
for (curproxy = proxy; curproxy; curproxy = curproxy->next) {
if (curproxy->state == PR_STSTOPPED)
continue;
if (!stktable_init(&curproxy->table)) {
Alert("Proxy '%s': failed to initialize stick-table.\n", curproxy->id);
cfgerr++;
}
}
/* /*
* Recount currently required checks. * Recount currently required checks.
*/ */
@ -7938,6 +7924,20 @@ out_uri_auth_compat:
} }
} }
/* initialize stick-tables on backend capable proxies. This must not
* be done earlier because the data size may be discovered while parsing
* other proxies.
*/
for (curproxy = proxy; curproxy; curproxy = curproxy->next) {
if (curproxy->state == PR_STSTOPPED)
continue;
if (!stktable_init(&curproxy->table)) {
Alert("Proxy '%s': failed to initialize stick-table.\n", curproxy->id);
cfgerr++;
}
}
if (mailers) { if (mailers) {
struct mailers *curmailers = mailers, **last; struct mailers *curmailers = mailers, **last;
struct mailer *m, *mb; struct mailer *m, *mb;