fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-05-21 14:41:21 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
antirez 2011-01-14 09:53:57 +01:00
parent f487bbbfe2
commit 360664c9c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/db.c
View File

@ -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) {
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;