Commit 360664c9 authored by antirez's avatar antirez
Browse files

master-slave replication fixed, it was not listing any key using KEYS command in the slave.

parent f487bbbf
...@@ -453,6 +453,8 @@ void propagateExpire(redisDb *db, robj *key) { ...@@ -453,6 +453,8 @@ void propagateExpire(redisDb *db, robj *key) {
int expireIfNeeded(redisDb *db, robj *key) { int expireIfNeeded(redisDb *db, robj *key) {
time_t when = getExpire(db,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: /* If we are running in the context of a slave, return ASAP:
* the slave key expiration is controlled by the master that will * the slave key expiration is controlled by the master that will
* send us synthesized DEL operations for expired keys. * send us synthesized DEL operations for expired keys.
...@@ -464,8 +466,6 @@ int expireIfNeeded(redisDb *db, robj *key) { ...@@ -464,8 +466,6 @@ int expireIfNeeded(redisDb *db, robj *key) {
return time(NULL) > when; return time(NULL) > when;
} }
if (when < 0) return 0;
/* Return when this key has not expired */ /* Return when this key has not expired */
if (time(NULL) <= when) return 0; if (time(NULL) <= when) return 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment