summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2014-11-11 15:10:58 +0100
committerantirez <antirez@gmail.com>2014-11-11 15:10:58 +0100
commitf5c6ebbfe3620d16c1e83c2ccaf1cec5a312aaae (patch)
tree847a5685e05f2e17cf79e549516a9bfc4fb6180c
parent5a526c22cc39c4b455f7e2f69eb9d48112d5eb33 (diff)
downloadredis-f5c6ebbfe3620d16c1e83c2ccaf1cec5a312aaae.tar.gz
Disconnect timedout slave: regression introduced with diskless repl.
-rw-r--r--src/replication.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/replication.c b/src/replication.c
index 1a4ca2503..8e97a330a 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -2003,8 +2003,9 @@ void replicationCron(void) {
if (slave->flags & REDIS_PRE_PSYNC) continue;
if ((server.unixtime - slave->repl_ack_time) > server.repl_timeout)
{
- redisLog(REDIS_WARNING, "Disconnecting timedout slave: %s",
- replicationGetSlaveName(slave));
+ redisLog(REDIS_WARNING, "Disconnecting timedout slave: %s",
+ replicationGetSlaveName(slave));
+ freeClient(slave);
}
}
}