gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cluster: clear the PROMOTED slave directly into clusterSetMaster().

Browse Source 
This way we make sure every time a master is turned into a replica
the flag will be cleared.
This commit is contained in:
antirez 2013-03-20 11:50:55 +01:00
parent e006407fd0
commit 8c1bc8e865
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cluster.c
View File

@ -1849,6 +1849,9 @@ void clusterSetMaster(clusterNode *n) {
myself->flags &= ~REDIS_NODE_MASTER; myself->flags &= ~REDIS_NODE_MASTER;
myself->flags |= REDIS_NODE_SLAVE; myself->flags |= REDIS_NODE_SLAVE;
} }
/* Clear the promoted flag anyway if we are a slave, to ensure it will
* be set only when the node turns into a master because of fail over. */
myself->flags &= ~REDIS_NODE_PROMOTED;
myself->slaveof = n; myself->slaveof = n;
replicationSetMaster(n->ip, n->port); replicationSetMaster(n->ip, n->port);
} }
@ -2247,7 +2250,6 @@ void clusterCommand(redisClient *c) {
} }
/* Set the master. */ /* Set the master. */
server.cluster->myself->flags &= ~REDIS_NODE_PROMOTED;
clusterSetMaster(n); clusterSetMaster(n);
clusterUpdateState(); clusterUpdateState();
clusterSaveConfigOrDie(); clusterSaveConfigOrDie();