ldap/servers/slapd/back-ldbm/back-ldbm.h | 9 ++++++---
ldap/servers/slapd/back-ldbm/dblayer.c | 2 +-
ldap/servers/slapd/back-ldbm/ldbm_config.c | 2 +-
ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit ed2875b4c8895c85f4f21068fb6a0c146536ae04
Author: William Brown <firstyear(a)redhat.com>
Date: Fri Nov 18 10:11:50 2016 +1000
Ticket 49042 - Increase cache defaults slightly
Bug Description: We have very small defaults for most sites right now. If we
increase these, we will see a benefit to performance and reduction in cache
eviction. It will help freeipa with it's out of box performance issue before
we move to the full automatic tuning.
Fix Description: Change the defaults:
dbcachesize 10MB -> 32MB
entrycachesize 10MB -> 32MB
dncachesize 10MB -> 16MB
https://fedorahosted.org/389/ticket/49042
Author: wibrown
Review by: ???
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h
b/ldap/servers/slapd/back-ldbm/back-ldbm.h
index 8b63e2c..ecef956 100644
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
@@ -160,11 +160,14 @@ typedef unsigned short u_int16_t;
#define LDBM_VERSION_31 "Netscape-ldbm/3.1"
#define LDBM_FILENAME_SUFFIX LDBM_SUFFIX
#define DBVERSION_FILENAME "DBVERSION"
-#define DEFAULT_CACHE_SIZE (size_t)10485760
+#define DEFAULT_CACHE_SIZE (size_t)33554432
+#define DEFAULT_CACHE_SIZE_STR "33554432"
#define DEFAULT_CACHE_ENTRIES -1 /* no limit */
-#define DEFAULT_DNCACHE_SIZE (size_t)10485760
+#define DEFAULT_DNCACHE_SIZE (size_t)16777216
+#define DEFAULT_DNCACHE_SIZE_STR "16777216"
#define DEFAULT_DNCACHE_MAXCOUNT -1 /* no limit */
-#define DEFAULT_DBCACHE_SIZE 1000000
+#define DEFAULT_DBCACHE_SIZE 33554432
+#define DEFAULT_DBCACHE_SIZE_STR "33554432"
#define DEFAULT_MODE 0600
#define DEFAULT_ALLIDSTHRESHOLD 4000
#define DEFAULT_IDL_TUNE 1
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c
b/ldap/servers/slapd/back-ldbm/dblayer.c
index 56792c3..04d31b1 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -2348,7 +2348,7 @@ dblayer_get_aux_id2entry_ext(backend *be, DB **ppDB, DB_ENV
**ppEnv,
}
envflags = DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE;
- cachesize = 10485760; /* 10M */
+ cachesize = DEFAULT_DBCACHE_SIZE;
if (!*ppEnv) {
mypEnv->dblayer_DB_ENV->set_cachesize(mypEnv->dblayer_DB_ENV,
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c
b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index 0aac833..4b612db 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -1501,7 +1501,7 @@ static config_info ldbm_config[] = {
{CONFIG_MODE, CONFIG_TYPE_INT_OCTAL, "0600", &ldbm_config_mode_get,
&ldbm_config_mode_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_IDLISTSCANLIMIT, CONFIG_TYPE_INT, "4000",
&ldbm_config_allidsthreshold_get, &ldbm_config_allidsthreshold_set,
CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_DIRECTORY, CONFIG_TYPE_STRING, "", &ldbm_config_directory_get,
&ldbm_config_directory_set,
CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE|CONFIG_FLAG_SKIP_DEFAULT_SETTING},
- {CONFIG_DBCACHESIZE, CONFIG_TYPE_SIZE_T, "10000000",
&ldbm_config_dbcachesize_get, &ldbm_config_dbcachesize_set,
CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
+ {CONFIG_DBCACHESIZE, CONFIG_TYPE_SIZE_T, DEFAULT_DBCACHE_SIZE_STR,
&ldbm_config_dbcachesize_get, &ldbm_config_dbcachesize_set,
CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_DBNCACHE, CONFIG_TYPE_INT, "0", &ldbm_config_dbncache_get,
&ldbm_config_dbncache_set, CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_MAXPASSBEFOREMERGE, CONFIG_TYPE_INT, "100",
&ldbm_config_maxpassbeforemerge_get, &ldbm_config_maxpassbeforemerge_set, 0},
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
index 2d23ea5..e03954d 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
@@ -297,11 +297,11 @@ ldbm_instance_config_require_index_set(void *arg, void *value, char
*errorbuf, i
*----------------------------------------------------------------------*/
static config_info ldbm_instance_config[] = {
{CONFIG_INSTANCE_CACHESIZE, CONFIG_TYPE_LONG, "-1",
&ldbm_instance_config_cachesize_get, &ldbm_instance_config_cachesize_set,
CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
- {CONFIG_INSTANCE_CACHEMEMSIZE, CONFIG_TYPE_SIZE_T, "10485760",
&ldbm_instance_config_cachememsize_get, &ldbm_instance_config_cachememsize_set,
CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
+ {CONFIG_INSTANCE_CACHEMEMSIZE, CONFIG_TYPE_SIZE_T, DEFAULT_CACHE_SIZE_STR,
&ldbm_instance_config_cachememsize_get, &ldbm_instance_config_cachememsize_set,
CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_INSTANCE_READONLY, CONFIG_TYPE_ONOFF, "off",
&ldbm_instance_config_readonly_get, &ldbm_instance_config_readonly_set,
CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_INSTANCE_REQUIRE_INDEX, CONFIG_TYPE_ONOFF, "off",
&ldbm_instance_config_require_index_get, &ldbm_instance_config_require_index_set,
CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_INSTANCE_DIR, CONFIG_TYPE_STRING, NULL,
&ldbm_instance_config_instance_dir_get, &ldbm_instance_config_instance_dir_set,
CONFIG_FLAG_ALWAYS_SHOW},
- {CONFIG_INSTANCE_DNCACHEMEMSIZE, CONFIG_TYPE_SIZE_T, "10485760",
&ldbm_instance_config_dncachememsize_get,
&ldbm_instance_config_dncachememsize_set,
CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
+ {CONFIG_INSTANCE_DNCACHEMEMSIZE, CONFIG_TYPE_SIZE_T, DEFAULT_DNCACHE_SIZE_STR,
&ldbm_instance_config_dncachememsize_get,
&ldbm_instance_config_dncachememsize_set,
CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{NULL, 0, NULL, NULL, NULL, 0}
};