MINOR: listener: refine the default MAX_ACCEPT from 64 to 4

The maximum number of connections accepted at once by a thread for a single
listener used to default to 64 divided by the number of processes but the
tasklet-based model is much more scalable and benefits from smaller values.
Experimentation has shown that 4 gives the highest accept rate for all
thread values, and that 3 and 5 come very close, as shown below (HTTP/1
connections forwarded per second at multi-accept 4 and 64):

 ac\thr|    1     2    4     8     16
 ------+------------------------------
      4|   80k  106k  168k  270k  336k
     64|   63k   89k  145k  230k  274k

Some tests were also conducted on SSL and absolutely no change was observed.

The value was placed into a define because it used to be spread all over the
code.

It might be useful at some point to backport this to 2.3 and 2.2 to help
those who observed some performance regressions from 1.6.

(cherry picked from commit 66161326fd120652557d419810b1323405d7859d)
Signed-off-by: Willy Tarreau <w@1wt.eu>

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 3aca9c2..c5d4b82 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2308,14 +2308,15 @@ tune.lua.service-timeout <timeout>
 tune.maxaccept <number>
   Sets the maximum number of consecutive connections a process may accept in a
   row before switching to other work. In single process mode, higher numbers
-  give better performance at high connection rates. However in multi-process
-  modes, keeping a bit of fairness between processes generally is better to
-  increase performance. This value applies individually to each listener, so
-  that the number of processes a listener is bound to is taken into account.
-  This value defaults to 64. In multi-process mode, it is divided by twice
-  the number of processes the listener is bound to. Setting this value to -1
-  completely disables the limitation. It should normally not be needed to tweak
-  this value.
+  used to give better performance at high connection rates, though this is not
+  the case anymore with the multi-queue. This value applies individually to
+  each listener, so that the number of processes a listener is bound to is
+  taken into account. This value defaults to 4 which showed best results. If a
+  significantly higher value was inherited from an ancient config, it might be
+  worth removing it as it will both increase performance and lower response
+  time. In multi-process mode, it is divided by twice the number of processes
+  the listener is bound to. Setting this value to -1 completely disables the
+  limitation. It should normally not be needed to tweak this value.
 
 tune.maxpollevents <number>
   Sets the maximum amount of events that can be processed at once in a call to

diff --git a/include/haproxy/defaults.h b/include/haproxy/defaults.h
index 10a562e..13099fd 100644 (file)
--- a/include/haproxy/defaults.h
+++ b/include/haproxy/defaults.h
@@ -170,6 +170,22 @@
 #define MAX_POLL_EVENTS 200
 #endif
 
+// The maximum number of connections accepted at once by a thread for a single
+// listener. It used to default to 64 divided by the number of processes but
+// the tasklet-based model is much more scalable and benefits from smaller
+// values. Experimentation has shown that 4 gives the highest accept rate for
+// all thread values, and that 3 and 5 come very close, as shown below (HTTP/1
+// connections forwarded per second at multi-accept 4 and 64):
+//
+// ac\thr|    1    2     4     8     16
+// ------+------------------------------
+//      4|   80k  106k  168k  270k  336k
+//     64|   63k   89k  145k  230k  274k
+//
+#ifndef MAX_ACCEPT
+#define MAX_ACCEPT 4
+#endif
+
 // the max number of tasks to run at once. Tests have shown the following
 // number of requests/s for 1 to 16 threads (1c1t, 1c2t, 2c4t, 4c8t, 4c16t):
 //

diff --git a/src/cfgparse.c b/src/cfgparse.c
index ba50458..dce65f8 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -3684,7 +3684,7 @@ out_uri_auth_compat:
                        if (curproxy->options & PR_O_TCP_NOLING)
                                listener->options |= LI_O_NOLINGER;
                        if (!listener->maxaccept)
-                               listener->maxaccept = global.tune.maxaccept ? global.tune.maxaccept : 64;
+                               listener->maxaccept = global.tune.maxaccept ? global.tune.maxaccept : MAX_ACCEPT;
 
                        /* we want to have an optimal behaviour on single process mode to
                         * maximize the work at once, but in multi-process we want to keep

diff --git a/src/listener.c b/src/listener.c
index 87b2bd2..f498d4a 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -124,7 +124,7 @@ static struct task *accept_queue_process(struct task *t, void *context, unsigned
        /* if global.tune.maxaccept is -1, then max_accept is UINT_MAX. It
         * is not really illimited, but it is probably enough.
         */
-       max_accept = global.tune.maxaccept ? global.tune.maxaccept : 64;
+       max_accept = global.tune.maxaccept ? global.tune.maxaccept : MAX_ACCEPT;
        for (; max_accept; max_accept--) {
                conn = accept_queue_pop_sc(ring);
                if (!conn)

diff --git a/src/log.c b/src/log.c
index 6014bfc..b18e612 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -3839,7 +3839,7 @@ int cfg_parse_log_forward(const char *file, int linenum, char **args, int kwm)
                        }
                }
                list_for_each_entry(l, &bind_conf->listeners, by_bind) {
-                       l->maxaccept = global.tune.maxaccept ? global.tune.maxaccept : 64;
+                       l->maxaccept = global.tune.maxaccept ? global.tune.maxaccept : MAX_ACCEPT;
                        l->accept = session_accept_fd;
                        l->analysers |=  cfg_log_forward->fe_req_ana;
                        l->default_target = cfg_log_forward->default_target;
@@ -3907,7 +3907,7 @@ int cfg_parse_log_forward(const char *file, int linenum, char **args, int kwm)
                }
                list_for_each_entry(l, &bind_conf->listeners, by_bind) {
                        /* the fact that the sockets are of type dgram is guaranteed by str2receiver() */
-                       l->maxaccept = global.tune.maxaccept ? global.tune.maxaccept : 64;
+                       l->maxaccept = global.tune.maxaccept ? global.tune.maxaccept : MAX_ACCEPT;
                        l->rx.iocb   = syslog_fd_handler;
                        global.maxsock++;
                }