From: Willy Tarreau <w@1wt.eu>
Date: Mon, 14 Dec 2015 11:04:35 +0000 (+0100)
Subject: MINOR: config: make tune.recv_enough configurable
X-Git-Tag: v1.7-dev1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b22fc30aaa6b39a95e190c3914af182a2aa6ecd2;p=thirdparty%2Fhaproxy.git

MINOR: config: make tune.recv_enough configurable

This setting used to be assigned to a variable tunable from a constant
and for an unknown reason never made its way into the config parser.

tune.recv_enough <number>
  Haproxy uses some hints to detect that a short read indicates the end of the
  socket buffers. One of them is that a read returns more than <recv_enough>
  bytes, which defaults to 10136 (7 segments of 1448 each). This default value
  may be changed by this setting to better deal with workloads involving lots
  of short messages such as telnet or SSH sessions.
---

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 2f179fdae6..960ab63722 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -593,6 +593,7 @@ The following keywords are supported in the "global" section :
    - tune.pipesize
    - tune.rcvbuf.client
    - tune.rcvbuf.server
+   - tune.recv_enough
    - tune.sndbuf.client
    - tune.sndbuf.server
    - tune.ssl.cachesize
@@ -1280,6 +1281,13 @@ tune.rcvbuf.server <number>
   order to save kernel memory by preventing it from buffering too large amounts
   of received data. Lower values will significantly increase CPU usage though.
 
+tune.recv_enough <number>
+  Haproxy uses some hints to detect that a short read indicates the end of the
+  socket buffers. One of them is that a read returns more than <recv_enough>
+  bytes, which defaults to 10136 (7 segments of 1448 each). This default value
+  may be changed by this setting to better deal with workloads involving lots
+  of short messages such as telnet or SSH sessions.
+
 tune.sndbuf.client <number>
 tune.sndbuf.server <number>
   Forces the kernel socket send buffer size on the client or the server side to
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 97f4243097..efbf10dd52 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -707,6 +707,16 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
 		}
 		global.tune.chksize = atol(args[1]);
 	}
+	else if (!strcmp(args[0], "tune.recv_enough")) {
+		if (alertif_too_many_args(1, file, linenum, args, &err_code))
+			goto out;
+		if (*(args[1]) == 0) {
+			Alert("parsing [%s:%d] : '%s' expects an integer argument.\n", file, linenum, args[0]);
+			err_code |= ERR_ALERT | ERR_FATAL;
+			goto out;
+		}
+		global.tune.recv_enough = atol(args[1]);
+	}
 #ifdef USE_OPENSSL
 	else if (!strcmp(args[0], "tune.ssl.force-private-cache")) {
 		if (alertif_too_many_args(0, file, linenum, args, &err_code))