Commit 2e167f7d authored by WuYunlong's avatar WuYunlong
Browse files

fix server.repl_down_since resetting, so that slaves could failover

automatically as expected.
parent aeb7bc3e
...@@ -1087,6 +1087,7 @@ void replicationCreateMasterClient(int fd, int dbid) { ...@@ -1087,6 +1087,7 @@ void replicationCreateMasterClient(int fd, int dbid) {
if (server.master->reploff == -1) if (server.master->reploff == -1)
server.master->flags |= CLIENT_PRE_PSYNC; server.master->flags |= CLIENT_PRE_PSYNC;
if (dbid != -1) selectDb(server.master,dbid); if (dbid != -1) selectDb(server.master,dbid);
server.repl_down_since = 0;
} }
void restartAOF() { void restartAOF() {
...@@ -1950,7 +1951,6 @@ void replicationSetMaster(char *ip, int port) { ...@@ -1950,7 +1951,6 @@ void replicationSetMaster(char *ip, int port) {
* our own parameters, to later PSYNC with the new master. */ * our own parameters, to later PSYNC with the new master. */
if (was_master) replicationCacheMasterUsingMyself(); if (was_master) replicationCacheMasterUsingMyself();
server.repl_state = REPL_STATE_CONNECT; server.repl_state = REPL_STATE_CONNECT;
server.repl_down_since = 0;
} }
/* Cancel replication, setting the instance as a master itself. */ /* Cancel replication, setting the instance as a master itself. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment