fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-23 19:10:51 +00:00
Code Issues Projects Releases Wiki Activity

Cluster: turn old master into a replica of node that failed over.

Browse Source 
So when the failing master node is back in touch with the cluster,
instead of remaining unused it is converted into a replica of the
new master, ready to perform the fail over if the new master node
will fail at some point.

Note that as a side effect clients with stale configuration are now
not an issue as well, as the node converted into a slave will not
accept queries but will redirect clients accordingly.
This commit is contained in:
antirez 2013-03-20 00:30:47 +01:00
parent 4d62623015
commit d15b027d91
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cluster.c
View File

@ -50,6 +50,7 @@ int clusterAddSlot(clusterNode *n, int slot);
int clusterDelSlot(int slot); int clusterDelSlot(int slot);
int clusterDelNodeSlots(clusterNode *node); int clusterDelNodeSlots(clusterNode *node);
int clusterNodeSetSlotBit(clusterNode *n, int slot); int clusterNodeSetSlotBit(clusterNode *n, int slot);
void clusterSetMaster(clusterNode *n);
int bitmapTestBit(unsigned char *bitmap, int pos); int bitmapTestBit(unsigned char *bitmap, int pos);
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
@ -885,12 +886,25 @@ int clusterProcessPacket(clusterLink *link) {
{ {
/* Node is a master. */ /* Node is a master. */
if (sender->flags & REDIS_NODE_SLAVE) { if (sender->flags & REDIS_NODE_SLAVE) {
/* Slave turned into master? Reconfigure it. */ /* Slave turned into master! */
clusterNode *oldmaster = sender->slaveof;
/* Reconfigure node as master. */
if (sender->slaveof) if (sender->slaveof)
clusterNodeRemoveSlave(sender->slaveof,sender); clusterNodeRemoveSlave(sender->slaveof,sender);
sender->flags &= ~REDIS_NODE_SLAVE; sender->flags &= ~REDIS_NODE_SLAVE;
sender->flags |= REDIS_NODE_MASTER; sender->flags |= REDIS_NODE_MASTER;
sender->slaveof = NULL; sender->slaveof = NULL;
/* If this node used to be our slave, it means that
* we were failed over. We'll turn ourself into a slave
* of the new master. */
if (oldmaster == server.cluster->myself) {
redisLog(REDIS_WARNING,"One of my slaves took my place. Reconfiguring myself as a replica of %.40s", sender->name);
clusterSetMaster(sender);
}
/* Update config and state. */
update_state = 1; update_state = 1;
update_config = 1; update_config = 1;
} }
@ -899,12 +913,15 @@ int clusterProcessPacket(clusterLink *link) {
clusterNode *master = clusterLookupNode(hdr->slaveof); clusterNode *master = clusterLookupNode(hdr->slaveof);
if (sender->flags & REDIS_NODE_MASTER) { if (sender->flags & REDIS_NODE_MASTER) {
/* Master just turned into a slave? Reconfigure the node. */ /* Master turned into a slave! Reconfigure the node. */
clusterDelNodeSlots(sender); clusterDelNodeSlots(sender);
sender->flags &= ~REDIS_NODE_MASTER; sender->flags &= ~REDIS_NODE_MASTER;
sender->flags |= REDIS_NODE_SLAVE; sender->flags |= REDIS_NODE_SLAVE;
/* Remove the list of slaves from the node. */ /* Remove the list of slaves from the node. */
if (sender->numslaves) clusterNodeResetSlaves(sender); if (sender->numslaves) clusterNodeResetSlaves(sender);
/* Update config and state. */
update_state = 1; update_state = 1;
update_config = 1; update_config = 1;
} }