From: Steven Hartland <steven.hartland@multiplay.co.uk>
Date: Thu, 30 Oct 2014 15:43:07 +0000 (+0000)
Subject: Increase listen backlog to deal with request spikes
X-Git-Tag: v1.5.0-rc1~16^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F552%2Fhead;p=thirdparty%2Frrdtool-1.x.git

Increase listen backlog to deal with request spikes

In order to deal with transient request spikes don't limit the
connection backlog to 10 instead use a default appropriate to
the OS.

For FreeBSD and Mac OS this is -1 (system default) for everything
else this is 511 which will get truncated back to the OS max.
---

diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index f34d08af..5eb4c774 100644
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
@@ -120,6 +120,12 @@
     syslog ((severity), __VA_ARGS__); \
   } while (0)
 
+#if defined(__FreeBSD__) || defined(__APPLE__)
+#define RRD_LISTEN_BACKLOG -1
+#else
+#define RRD_LISTEN_BACKLOG 511
+#endif
+
 /*
  * Types
  */
@@ -3215,7 +3221,7 @@ static int open_listen_socket_unix (const listen_socket_t *sock) /* {{{ */
           (unsigned int)sock->socket_permissions, strerror(errno));
   }
 
-  status = listen (fd, /* backlog = */ 10);
+  status = listen(fd, RRD_LISTEN_BACKLOG);
   if (status != 0)
   {
     fprintf (stderr, "rrdcached: listen(%s) failed: %s.\n",
@@ -3350,7 +3356,7 @@ static int open_listen_socket_network(const listen_socket_t *sock) /* {{{ */
       continue;
     }
 
-    status = listen (fd, /* backlog = */ 10);
+    status = listen(fd, RRD_LISTEN_BACKLOG);
     if (status != 0)
     {
       fprintf (stderr, "rrdcached: listen(%s) failed: %s\n.",