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

[BUG] do not try to pause backends during reload

Browse Source 
During a configuration reload, haproxy tried to pause all proxies.
Unfortunately, it also tried to pause backends, which would fail
and cause trouble to the new process since the port was still bound.
This commit is contained in:
Willy Tarreau 2008-10-10 17:51:34 +02:00
parent c4922d89e7
commit eab5c70f93
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/proxy.c
View File

@ -388,8 +388,8 @@ void soft_stop(void)
tv_now(&now); /* else, the old time before select will be used */ tv_now(&now); /* else, the old time before select will be used */
while (p) { while (p) {
if (p->state != PR_STSTOPPED) { if (p->state != PR_STSTOPPED) {
Warning("Stopping proxy %s in %d ms.\n", p->id, p->grace); Warning("Stopping %s %s in %d ms.\n", proxy_cap_str(p->cap), p->id, p->grace);
send_log(p, LOG_WARNING, "Stopping proxy %s in %d ms.\n", p->id, p->grace); send_log(p, LOG_WARNING, "Stopping %s %s in %d ms.\n", proxy_cap_str(p->cap), p->id, p->grace);
tv_ms_add(&p->stop_time, &now, p->grace); tv_ms_add(&p->stop_time, &now, p->grace);
} }
p = p->next; p = p->next;
@ -436,16 +436,17 @@ void pause_proxies(void)
p = proxy; p = proxy;
tv_now(&now); /* else, the old time before select will be used */ tv_now(&now); /* else, the old time before select will be used */
while (p) { while (p) {
if (p->state != PR_STERROR && if (p->cap & PR_CAP_FE &&
p->state != PR_STERROR &&
p->state != PR_STSTOPPED && p->state != PR_STSTOPPED &&
p->state != PR_STPAUSED) { p->state != PR_STPAUSED) {
Warning("Pausing proxy %s.\n", p->id); Warning("Pausing %s %s.\n", proxy_cap_str(p->cap), p->id);
send_log(p, LOG_WARNING, "Pausing proxy %s.\n", p->id); send_log(p, LOG_WARNING, "Pausing %s %s.\n", proxy_cap_str(p->cap), p->id);
pause_proxy(p); pause_proxy(p);
if (p->state != PR_STPAUSED) { if (p->state != PR_STPAUSED) {
err |= 1; err |= 1;
Warning("Proxy %s failed to enter pause mode.\n", p->id); Warning("%s %s failed to enter pause mode.\n", proxy_cap_str(p->cap), p->id);
send_log(p, LOG_WARNING, "Proxy %s failed to enter pause mode.\n", p->id); send_log(p, LOG_WARNING, "%s %s failed to enter pause mode.\n", proxy_cap_str(p->cap), p->id);
} }
} }
p = p->next; p = p->next;
@ -472,8 +473,8 @@ void listen_proxies(void)
tv_now(&now); /* else, the old time before select will be used */ tv_now(&now); /* else, the old time before select will be used */
while (p) { while (p) {
if (p->state == PR_STPAUSED) { if (p->state == PR_STPAUSED) {
Warning("Enabling proxy %s.\n", p->id); Warning("Enabling %s %s.\n", proxy_cap_str(p->cap), p->id);
send_log(p, LOG_WARNING, "Enabling proxy %s.\n", p->id); send_log(p, LOG_WARNING, "Enabling %s %s.\n", proxy_cap_str(p->cap), p->id);
for (l = p->listen; l != NULL; l = l->next) { for (l = p->listen; l != NULL; l = l->next) {
if (listen(l->fd, p->backlog ? p->backlog : p->maxconn) == 0) { if (listen(l->fd, p->backlog ? p->backlog : p->maxconn) == 0) {
@ -491,10 +492,10 @@ void listen_proxies(void)
else else
port = ntohs(((struct sockaddr_in *)(&l->addr))->sin_port); port = ntohs(((struct sockaddr_in *)(&l->addr))->sin_port);
Warning("Port %d busy while trying to enable proxy %s.\n", Warning("Port %d busy while trying to enable %s %s.\n",
port, p->id); port, proxy_cap_str(p->cap), p->id);
send_log(p, LOG_WARNING, "Port %d busy while trying to enable proxy %s.\n", send_log(p, LOG_WARNING, "Port %d busy while trying to enable %s %s.\n",
port, p->id); port, proxy_cap_str(p->cap), p->id);
/* Another port might have been enabled. Let's stop everything. */ /* Another port might have been enabled. Let's stop everything. */
pause_proxy(p); pause_proxy(p);
break; break;