Blame SOURCES/0053-Ticket-49257-Reject-dbcachesize-updates-while-auto-c.patch

74ca47
From 550d30d3aa27cd69057604e1ee7d5ca43711d718 Mon Sep 17 00:00:00 2001
74ca47
From: Mark Reynolds <mreynolds@redhat.com>
74ca47
Date: Mon, 15 May 2017 13:30:22 -0400
74ca47
Subject: [PATCH] Ticket 49257 - Reject dbcachesize updates while auto cache
74ca47
 sizing is enabled
74ca47
74ca47
Description:  We should reject updates to nsslapd-dbcachesize while auto cache sizing
74ca47
              is in effect.  This is because at startup we would overwrite the
74ca47
              manually set dbcache size anyway.  It would never take effect, so it
74ca47
              should be rejected.
74ca47
74ca47
https://pagure.io/389-ds-base/issue/49257
74ca47
74ca47
Reviewed by: tbordaz & firstyear(Thanks!!)
74ca47
---
74ca47
 ldap/servers/slapd/back-ldbm/ldbm_config.c | 13 ++++++++++++-
74ca47
 1 file changed, 12 insertions(+), 1 deletion(-)
74ca47
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
74ca47
index f7edd9e..6c1dda0 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
74ca47
@@ -420,7 +420,7 @@ static int ldbm_config_dbcachesize_set(void *arg, void *value, char *errorbuf, i
74ca47
         /* Stop the user configuring a stupidly small cache */
74ca47
         /* min: 8KB (page size) * def thrd cnts (threadnumber==20). */
74ca47
 #define DBDEFMINSIZ     500000
74ca47
-        /* We allow a value of 0, because the autotuting in start.c will
74ca47
+        /* We allow a value of 0, because the autotuning in start.c will
74ca47
          * register that, and trigger the recalculation of the dbcachesize as
74ca47
          * needed on the next start up.
74ca47
          */
74ca47
@@ -443,7 +443,18 @@ static int ldbm_config_dbcachesize_set(void *arg, void *value, char *errorbuf, i
74ca47
                 return LDAP_UNWILLING_TO_PERFORM;
74ca47
             }
74ca47
         }
74ca47
+
74ca47
         if (CONFIG_PHASE_RUNNING == phase) {
74ca47
+            if (val > 0 && li->li_cache_autosize) {
74ca47
+                /* We are auto-tuning the cache, so this change would be overwritten - return an error */
74ca47
+                slapi_create_errormsg(errorbuf, SLAPI_DSE_RETURNTEXT_SIZE,
74ca47
+                    "Error: \"nsslapd-dbcachesize\" can not be updated while \"nsslapd-cache-autosize\" is set "
74ca47
+                    "in \"cn=config,cn=ldbm database,cn=plugins,cn=config\".");
74ca47
+                slapi_log_err(SLAPI_LOG_ERR, "ldbm_config_dbcachesize_set",
74ca47
+                    "\"nsslapd-dbcachesize\" can not be set while \"nsslapd-cache-autosize\" is set "
74ca47
+                    "in \"cn=config,cn=ldbm database,cn=plugins,cn=config\".\n");
74ca47
+                return LDAP_UNWILLING_TO_PERFORM;
74ca47
+            }
74ca47
             li->li_new_dbcachesize = val;
74ca47
             if (val == 0) {
74ca47
                 slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_config_dbcachesize_set", "cache size reset to 0, will be autosized on next startup.\n");
74ca47
-- 
74ca47
2.9.4
74ca47