From 2e167f7d0e9abb5c49f8f0fb22a3fe2340ad0e31 Mon Sep 17 00:00:00 2001 From: WuYunlong Date: Sat, 30 Jun 2018 09:39:08 +0800 Subject: [PATCH] fix server.repl_down_since resetting, so that slaves could failover automatically as expected. --- src/replication.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/replication.c b/src/replication.c index 00c2a719..d5b5dc23 100644 --- a/src/replication.c +++ b/src/replication.c @@ -1087,6 +1087,7 @@ void replicationCreateMasterClient(int fd, int dbid) { if (server.master->reploff == -1) server.master->flags |= CLIENT_PRE_PSYNC; if (dbid != -1) selectDb(server.master,dbid); + server.repl_down_since = 0; } void restartAOF() { @@ -1950,7 +1951,6 @@ void replicationSetMaster(char *ip, int port) { * our own parameters, to later PSYNC with the new master. */ if (was_master) replicationCacheMasterUsingMyself(); server.repl_state = REPL_STATE_CONNECT; - server.repl_down_since = 0; } /* Cancel replication, setting the instance as a master itself. */