mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

[BUG] ensure that listeners from disabled proxies are correctly unbound.

Browse Source 
There is a problem when an instance is marked "disabled". Its ports are
still bound but will not be unbound upon termination. This causes processes
to accumulate during soft restarts, and might even cause failures to restart
new ones due to the inability to bind to the same port.

The ideal solution would be to bind all ports at the end of the configuration
parsing. An acceptable workaround is to unbind all listeners of disabled
proxies. This is what the current patch does.
This commit is contained in:
Willy Tarreau 2008-10-12 12:07:48 +02:00
parent eab5c70f93
commit a944218e9c
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/proto/proxy.h
View File

@ -30,6 +30,7 @@ int start_proxies(int verbose);
void maintain_proxies(struct timeval *next);
void soft_stop(void);
void pause_proxy(struct proxy *p);
void stop_proxy(struct proxy *p);
void pause_proxies(void);
void listen_proxies(void);

2
src/cfgparse.c
View File

@ -2726,6 +2726,8 @@ int readcfgfile(const char *file)
struct listener *listener;
if (curproxy->state == PR_STSTOPPED) {
/* ensure we don't keep listeners uselessly bound */
stop_proxy(curproxy);
curproxy = curproxy->next;
continue;
}

32
src/proxy.c
View File

@ -351,15 +351,7 @@ void maintain_proxies(struct timeval *next)
if (t == 0) {
Warning("Proxy %s stopped.\n", p->id);
send_log(p, LOG_WARNING, "Proxy %s stopped.\n", p->id);
for (l = p->listen; l != NULL; l = l->next) {
unbind_listener(l);
if (l->state >= LI_ASSIGNED) {
delete_listener(l);
listeners--;
}
}
p->state = PR_STSTOPPED;
stop_proxy(p);
/* try to free more memory */
pool_gc2();
}
@ -421,6 +413,28 @@ void pause_proxy(struct proxy *p)
}
}
/*
* This function completely stops a proxy and releases its listeners. It has
* to be called when going down in order to release the ports so that another
* process may bind to them. It must also be called on disabled proxies at the
* end of start-up. When all listeners are closed, the proxy is set to the
* PR_STSTOPPED state.
*/
void stop_proxy(struct proxy *p)
{
struct listener *l;
for (l = p->listen; l != NULL; l = l->next) {
unbind_listener(l);
if (l->state >= LI_ASSIGNED) {
delete_listener(l);
listeners--;
}
}
p->state = PR_STSTOPPED;
}
/*
* This function temporarily disables listening so that another new instance
* can start listening. It is designed to be called upon reception of a