From 3a73be752476f44dfb099863ac9424c2f27f2be0 Mon Sep 17 00:00:00 2001 From: antirez Date: Fri, 14 Jan 2011 09:53:57 +0100 Subject: [PATCH] master-slave replication fixed, it was not listing any key using KEYS command in the slave. --- src/db.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/db.c b/src/db.c index 1f321c01..669fba13 100644 --- a/src/db.c +++ b/src/db.c @@ -527,6 +527,8 @@ void propagateExpire(redisDb *db, robj *key) { int expireIfNeeded(redisDb *db, robj *key) { time_t when = getExpire(db,key); + if (when < 0) return 0; /* No expire for this key */ + /* If we are running in the context of a slave, return ASAP: * the slave key expiration is controlled by the master that will * send us synthesized DEL operations for expired keys. @@ -538,8 +540,6 @@ int expireIfNeeded(redisDb *db, robj *key) { return time(NULL) > when; } - if (when < 0) return 0; - /* Return when this key has not expired */ if (time(NULL) <= when) return 0; -- 2.47.2