From 6d080a0a419d3cf335a6ac0044eb48337111b75b Mon Sep 17 00:00:00 2001
From: William Brown <william@blackhats.net.au>
Date: Apr 18 2019 02:58:01 +0000
Subject: Ticket 50329 - improve connection default parameters


Bug Description: An issue was raised that appears that our default
values may be misleading and hard to configure correctly in some
circumstances. We should improve our default values to have better
time sharing for connections.

Fix Description: Improve ioblock to be shorter to prevent write
blocks, make reads quicker for sharing, and by default have an
idle disconnect to clients.

https://pagure.io/389-ds-base/issue/50329

Author: William Brown <william@blackhats.net.au>

Review by: ???

---

diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index 263eb9c..b0d5d41 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -935,7 +935,8 @@ connection_free_private_buffer(Connection *conn)
 #define CONN_DONE 3
 #define CONN_TIMEDOUT 4
 
-#define CONN_TURBO_TIMEOUT_INTERVAL 1000 /* milliseconds */
+#define CONN_TURBO_TIMEOUT_INTERVAL 400 /* milliseconds */
+#define CONN_TURBO_TIMEOUT_MAXIMUM 5 /* attempts * interval IE 2000ms with 400 * 5 */
 #define CONN_TURBO_CHECK_INTERVAL 5      /* seconds */
 #define CONN_TURBO_PERCENTILE 50         /* proportion of threads allowed to be in turbo mode */
 #define CONN_TURBO_HYSTERESIS 0          /* avoid flip flopping in and out of turbo mode */
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 92956b9..b3ede6f 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -241,8 +241,8 @@ typedef void (*VFPV)(); /* takes undefined arguments */
 
 #define SLAPD_DEFAULT_FILE_MODE S_IRUSR | S_IWUSR
 #define SLAPD_DEFAULT_DIR_MODE S_IRWXU
-#define SLAPD_DEFAULT_IDLE_TIMEOUT 0 /* seconds - 0 == never */
-#define SLAPD_DEFAULT_IDLE_TIMEOUT_STR "0"
+#define SLAPD_DEFAULT_IDLE_TIMEOUT 3600 /* seconds - 0 == never */
+#define SLAPD_DEFAULT_IDLE_TIMEOUT_STR "3600"
 #define SLAPD_DEFAULT_SIZELIMIT 2000 /* use -1 for no limit */
 #define SLAPD_DEFAULT_SIZELIMIT_STR "2000"
 #define SLAPD_DEFAULT_TIMELIMIT 3600 /* use -1 for no limit */
@@ -252,8 +252,8 @@ typedef void (*VFPV)(); /* takes undefined arguments */
 #define SLAPD_DEFAULT_MAX_FILTER_NEST_LEVEL 40 /* use -1 for no limit */
 #define SLAPD_DEFAULT_MAX_SASLIO_SIZE 2097152  /* 2MB in bytes.  Use -1 for no limit */
 #define SLAPD_DEFAULT_MAX_SASLIO_SIZE_STR "2097152"
-#define SLAPD_DEFAULT_IOBLOCK_TIMEOUT 300000 /* 5 minutes in ms */
-#define SLAPD_DEFAULT_IOBLOCK_TIMEOUT_STR "300000"
+#define SLAPD_DEFAULT_IOBLOCK_TIMEOUT 10000 /* 10 second in ms */
+#define SLAPD_DEFAULT_IOBLOCK_TIMEOUT_STR "10000"
 #define SLAPD_DEFAULT_OUTBOUND_LDAP_IO_TIMEOUT 300000 /* 5 minutes in ms */
 #define SLAPD_DEFAULT_OUTBOUND_LDAP_IO_TIMEOUT_STR "300000"
 #define SLAPD_DEFAULT_RESERVE_FDS 64