summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2014-11-11 15:10:58 +0100
committerantirez <antirez@gmail.com>2014-11-11 17:25:58 +0100
commitec1ab0f18b2a5344849fcf0c638309256b4b80f4 (patch)
treeea587484f087401d0df2000bc594536c9077eb37
parenteb67ca0f002062c9b7b03db2b92ddb594c5b7027 (diff)
downloadredis-ec1ab0f18b2a5344849fcf0c638309256b4b80f4.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 d14f581a5..d3d714459 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -1837,8 +1837,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);
}
}
}