From: Willy Tarreau <w@1wt.eu>
Date: Thu, 24 Sep 2020 08:51:29 +0000 (+0200)
Subject: MEDIUM: proxy: merge zombify_proxy() with stop_proxy()
X-Git-Tag: v2.3-dev6~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=337c835d16b936b576cdb6c746d575de20837905;p=thirdparty%2Fhaproxy.git

MEDIUM: proxy: merge zombify_proxy() with stop_proxy()

The two functions don't need to be distinguished anymore since they have
all the necessary info to act as needed on their listeners. Let's just
pass via stop_proxy() and make it check for each listener which one to
close or not.
---

diff --git a/include/haproxy/proxy.h b/include/haproxy/proxy.h
index b714bda817..043ffe6d79 100644
--- a/include/haproxy/proxy.h
+++ b/include/haproxy/proxy.h
@@ -44,7 +44,6 @@ void soft_stop(void);
 int pause_proxy(struct proxy *p);
 int resume_proxy(struct proxy *p);
 void stop_proxy(struct proxy *p);
-void zombify_proxy(struct proxy *p);
 void pause_proxies(void);
 void resume_proxies(void);
 int  stream_set_backend(struct stream *s, struct proxy *be);
diff --git a/src/haproxy.c b/src/haproxy.c
index bd05430fa5..f256dd8715 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3510,12 +3510,8 @@ int main(int argc, char **argv)
 		px = proxies_list;
 		while (px != NULL) {
 			if (px->bind_proc && !px->disabled) {
-				if (!(px->bind_proc & (1UL << proc))) {
-					if (global.tune.options & GTUNE_SOCKET_TRANSFER)
-						zombify_proxy(px);
-					else
-						stop_proxy(px);
-				}
+				if (!(px->bind_proc & (1UL << proc)))
+					stop_proxy(px);
 			}
 			px = px->next;
 		}
@@ -3524,12 +3520,8 @@ int main(int argc, char **argv)
 		px = cfg_log_forward;
 		while (px != NULL) {
 			if (px->bind_proc && !px->disabled) {
-				if (!(px->bind_proc & (1UL << proc))) {
-					if (global.tune.options & GTUNE_SOCKET_TRANSFER)
-						zombify_proxy(px);
-					else
-						stop_proxy(px);
-				}
+				if (!(px->bind_proc & (1UL << proc)))
+					stop_proxy(px);
 			}
 			px = px->next;
 		}
diff --git a/src/proxy.c b/src/proxy.c
index 217ca6fd3b..1e889f7a21 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1289,22 +1289,6 @@ int pause_proxy(struct proxy *p)
 	return 1;
 }
 
-/* This function makes the proxy unusable, but keeps the listening sockets
- * opened, so that if any process requests them, we are able to serve them.
- * This should only be called early, before we started accepting requests.
- */
-void zombify_proxy(struct proxy *p)
-{
-	struct listener *l;
-
-	list_for_each_entry(l, &p->conf.listeners, by_fe) {
-		unbind_listener_no_close(l);
-		if (l->state >= LI_ASSIGNED)
-			delete_listener(l);
-	}
-	p->disabled = 1;
-}
-
 /*
  * 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
@@ -1316,26 +1300,30 @@ void zombify_proxy(struct proxy *p)
 void stop_proxy(struct proxy *p)
 {
 	struct listener *l;
-	int nostop = 0;
 
 	HA_SPIN_LOCK(PROXY_LOCK, &p->lock);
 
 	list_for_each_entry(l, &p->conf.listeners, by_fe) {
 		if (l->options & LI_O_NOSTOP) {
 			HA_ATOMIC_ADD(&unstoppable_jobs, 1);
-			nostop = 1;
 			continue;
 		}
-		/* The master should not close an inherited FD */
-		if (master && (l->rx.flags & RX_F_INHERITED))
+
+		/* There are several cases where we must not close an FD:
+		 *   - we're starting up and we have socket transfers enabled;
+		 *   - we're the master and this FD was inherited;
+		 */
+		if ((global.tune.options & GTUNE_SOCKET_TRANSFER && global.mode & MODE_STARTING) ||
+		    (master && (l->rx.flags & RX_F_INHERITED)))
 			unbind_listener_no_close(l);
 		else
 			unbind_listener(l);
-		if (l->state >= LI_ASSIGNED) {
+
+		if (l->state >= LI_ASSIGNED)
 			delete_listener(l);
-		}
 	}
-	if (!nostop)
+
+	if (p->li_ready + p->li_bound + p->li_paused == 0)
 		p->disabled = 1;
 
 	HA_SPIN_UNLOCK(PROXY_LOCK, &p->lock);