fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-12 08:41:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5081 from trevor211/fixClusterFailover

Browse Source 
cluster failover bug
This commit is contained in:
Salvatore Sanfilippo
2018-07-03 12:36:53 +02:00
committed by GitHub
parent 2edcafb35d 2e167f7d0e
commit 02e385169e
2 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/replication.c
View File

@ -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. */