RSS aware maxmemory: enforced/adjusted == maxmemory on config changes.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/config.c b/src/config.c
index c4c4ec690..612d59c2f 100644
--- a/src/config.c
+++ b/src/config.c
@@ -226,6 +226,8 @@ void loadServerConfigFromString(char *config) {
             }
         } else if (!strcasecmp(argv[0],"maxmemory") && argc == 2) {
             server.maxmemory = memtoll(argv[1],NULL);
+            server.maxmemory_adjusted = server.maxmemory;
+            server.maxmemory_enforced = server.maxmemory;
         } else if (!strcasecmp(argv[0],"rss-aware-maxmemory") && argc==2) {
             if ((server.rss_aware_maxmemory = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
@@ -635,6 +637,8 @@ void configSetCommand(redisClient *c) {
         if (getLongLongFromObject(o,&ll) == REDIS_ERR ||
             ll < 0) goto badfmt;
         server.maxmemory = ll;
+        server.maxmemory_adjusted = ll;
+        server.maxmemory_enforced = ll;
         if (server.maxmemory) {
             if (server.maxmemory < zmalloc_used_memory()) {
                 redisLog(REDIS_WARNING,"WARNING: the new maxmemory value set via CONFIG SET is smaller than the current memory usage. This will result in keys eviction and/or inability to accept new write commands depending on the maxmemory-policy.");