BUG/MEDIUM: threads/fd: do not forget to take into account epoll_fd/pipes

Each thread uses one epoll_fd or kqueue_fd, and a pipe (thus two FDs).
These ones have to be accounted for in the maxsock calculation, otherwise
we can reach maxsock before maxconn. This is difficult to observe but it
in fact happens when a server connects back to the frontend and has checks
enabled : the check uses its FD and serves to fill the loop. In this case
all FDs planed for the datapath are used for this.

This needs to be backported to 1.9 and 1.8.

diff --git a/src/haproxy.c b/src/haproxy.c
index 317acebbb72638ac1fd9220cb12b230749cbf3db..b7979ea4eb857cd388e21d3174de4bf0c37c2578 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2162,6 +2162,9 @@ static void init(int argc, char **argv)
        global.hardmaxconn = global.maxconn;  /* keep this max value */
        global.maxsock += global.maxconn * 2; /* each connection needs two sockets */
        global.maxsock += global.maxpipes * 2; /* each pipe needs two FDs */
+       global.maxsock += global.nbthread;     /* one epoll_fd/kqueue_fd per thread */
+       global.maxsock += 2 * global.nbthread; /* one wake-up pipe (2 fd) per thread */
+
        /* compute fd used by async engines */
        if (global.ssl_used_async_engines) {
                int sides = !!global.ssl_used_frontend + !!global.ssl_used_backend;