Merge pull request #6074 from trevor211/fixActiveExpire

Do not active expire keys in the background when the switch is off.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/server.c b/src/server.c
index 9723fdbc1..4b87b6ac2 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1674,10 +1674,12 @@ void clientsCron(void) {
 void databasesCron(void) {
     /* Expire keys by random sampling. Not required for slaves
      * as master will synthesize DELs for us. */
-    if (server.active_expire_enabled && server.masterhost == NULL) {
-        activeExpireCycle(ACTIVE_EXPIRE_CYCLE_SLOW);
-    } else if (server.masterhost != NULL) {
-        expireSlaveKeys();
+    if (server.active_expire_enabled) {
+        if (server.masterhost == NULL) {
+            activeExpireCycle(ACTIVE_EXPIRE_CYCLE_SLOW);
+        } else {
+            expireSlaveKeys();
+        }
     }
 
     /* Defrag keys gradually. */