Only run the fast active expire cycle if master & enabled.

claywong · Aug 27, 2013 · 003cc8a · 003cc8a
1 parent 303dde3
commit 003cc8a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/redis.c b/src/redis.c
@@ -1180,8 +1180,10 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
     listNode *ln;
     redisClient *c;
 
-    /* Run a fast expire cycle. */
-    activeExpireCycle(ACTIVE_EXPIRE_CYCLE_FAST);
+    /* Run a fast expire cycle (the called function will return
+     * ASAP if a fast cycle is not needed). */
+    if (server.active_expire_enabled && server.masterhost == NULL)
+        activeExpireCycle(ACTIVE_EXPIRE_CYCLE_FAST);
 
     /* Try to process pending commands for clients that were just unblocked. */
     while (listLength(server.unblocked_clients)) {