From afce86838ea08a05bb2148eb45ef0a5646eb5007 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Fri, 20 Dec 2019 18:19:24 -0500
Subject: [PATCH] Only override maxmemory settings if everything is default

Former-commit-id: 9fb240d49c61f5a69124a17cfc769095cadd3d98
---
 src/config.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index a0686d899..b84fb4d8a 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -229,15 +229,14 @@ static bool initializeStorageProvider(sds *argv, int argc, const char **err)
     if (fResult)
     {
         // We need to set max memory to a sane default so keys are actually evicted properly
-        if (g_pserver->maxmemory == 0)
+        if (g_pserver->maxmemory == 0 && g_pserver->maxmemory_policy == MAXMEMORY_NO_EVICTION)
         {
             struct sysinfo sys;
             if (sysinfo(&sys) == 0)
             {
                 // By default it's half the memory.  This gives sufficient room for background saving
                 g_pserver->maxmemory = sys.totalram / 2;
-                if (g_pserver->maxmemory_policy == MAXMEMORY_NO_EVICTION)
-                    g_pserver->maxmemory_policy = MAXMEMORY_ALLKEYS_LRU;
+                g_pserver->maxmemory_policy = MAXMEMORY_ALLKEYS_LRU;
             }
         }
     }