Fixed issue #435 and at the same time introduced explicit ping in the master-slave channel that will detect a blocked master or a broken even if apparently connected TCP link.

This commit is contained in:
antirez
2011-01-20 13:18:23 +01:00
parent f25d5b5c9c
commit 89a1433e69
3 changed files with 48 additions and 4 deletions

View File

@ -497,7 +497,6 @@ void freeClient(redisClient *c) {
/* Case 2: we lost the connection with the master. */
if (c->flags & REDIS_MASTER) {
server.master = NULL;
/* FIXME */
server.replstate = REDIS_REPL_CONNECT;
/* Since we lost the connection with the master, we should also
* close the connection with all our slaves if we have any, so