From: Willy Tarreau <w@1wt.eu>
Date: Thu, 14 Mar 2019 18:13:17 +0000 (+0100)
Subject: BUG/MEDIUM: init/threads: consider epoll_fd/pipes for automatic maxconn calculation
X-Git-Tag: v2.0-dev2~60
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=3f20085617362cd1fd07da6058706019e5f8c3da;p=haproxy-2.1.git

BUG/MEDIUM: init/threads: consider epoll_fd/pipes for automatic maxconn calculation

This is the equivalent of the previous patch for the automatic maxconn
calculation. This doesn't need any backport.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index b7979ea..28c72a5 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1478,6 +1478,12 @@ static int compute_ideal_maxconn()
 	/* subtract listeners and checks */
 	remain -= global.maxsock;
 
+	/* one epoll_fd/kqueue_fd per thread */
+	remain -= global.nbthread;
+
+	/* one wake-up pipe (2 fd) per thread */
+	remain -= 2 * global.nbthread;
+
 	/* Fixed pipes values : we only subtract them if they're not larger
 	 * than the remaining FDs because pipes are optional.
 	 */