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

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.

diff --git a/include/proto/proxy.h b/include/proto/proxy.h
index f00f6469739ac015eebd1f8f0bc4ee1dd20f27c3..6247c010baeedbfc5b9282ed7d21261a225b9e56 100644 (file)
--- a/include/proto/proxy.h
+++ b/include/proto/proxy.h
@@ -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);
 

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 32f5d65df59259843f836b1f3a7ae7822dad7905..5c525bf33618975d4134d310fe795cc1b4076366 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2609,6 +2609,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;
                }

diff --git a/src/proxy.c b/src/proxy.c
index 7fe78c785f6f81f01946d905193dc4cdcb41d4f4..6219920622189dafd0dc64a7dcf5304e4de15591 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -316,15 +316,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();
                                }
@@ -386,6 +378,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