diff options
| -rw-r--r-- | src/redis-check-rdb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/redis-check-rdb.c b/src/redis-check-rdb.c index 50854be0c..8de1d8f48 100644 --- a/src/redis-check-rdb.c +++ b/src/redis-check-rdb.c @@ -286,12 +286,8 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) { /* Read value */ rdbstate.doing = RDB_CHECK_DOING_READ_OBJECT_VALUE; if ((val = rdbLoadObject(type,&rdb)) == NULL) goto eoferr; - /* Check if the key already expired. This function is used when loading - * an RDB file from disk, either at startup, or when an RDB was - * received from the master. In the latter case, the master is - * responsible for key expiry. If we would expire keys here, the - * snapshot taken by the master may not be reflected on the slave. */ - if (server.masterhost == NULL && expiretime != -1 && expiretime < now) + /* Check if the key already expired. */ + if (expiretime != -1 && expiretime < now) rdbstate.already_expired++; if (expiretime != -1) rdbstate.expires++; rdbstate.key = NULL; |