fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-27 21:01:04 +00:00
Code Issues Projects Releases Wiki Activity

Cluster: a bit more serious node role change handling.

Browse Source
This commit is contained in:
antirez 2013-03-15 16:35:16 +01:00
parent 004fbef847
commit d512a09c20
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/cluster.c
View File

@ -48,6 +48,7 @@ clusterNode *clusterLookupNode(char *name);
int clusterNodeAddSlave(clusterNode *master, clusterNode *slave); int clusterNodeAddSlave(clusterNode *master, clusterNode *slave);
int clusterAddSlot(clusterNode *n, int slot); int clusterAddSlot(clusterNode *n, int slot);
int clusterDelSlot(int slot); int clusterDelSlot(int slot);
int clusterDelNodeSlots(clusterNode *node);
int clusterNodeSetSlotBit(clusterNode *n, int slot); int clusterNodeSetSlotBit(clusterNode *n, int slot);
int bitmapTestBit(unsigned char *bitmap, int pos); int bitmapTestBit(unsigned char *bitmap, int pos);
@ -882,14 +883,31 @@ int clusterProcessPacket(clusterLink *link) {
if (!memcmp(hdr->slaveof,REDIS_NODE_NULL_NAME, if (!memcmp(hdr->slaveof,REDIS_NODE_NULL_NAME,
sizeof(hdr->slaveof))) sizeof(hdr->slaveof)))
{ {
if (sender->slaveof) /* Node is a master. */
if (sender->flags & REDIS_NODE_SLAVE &&
sender->slaveof != NULL)
{
/* If the node changed role and is now a master, remove
* it from the list of slaves of its old master. */
clusterNodeRemoveSlave(sender->slaveof,sender); clusterNodeRemoveSlave(sender->slaveof,sender);
update_state = 1;
update_config = 1;
}
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;
} else { } else {
/* Node is a slave. */
clusterNode *master = clusterLookupNode(hdr->slaveof); clusterNode *master = clusterLookupNode(hdr->slaveof);
if (sender->flags & REDIS_NODE_MASTER) {
/* If the node changed role and is now a slave, clear all
* its slots as them are no longer served. */
clusterDelNodeSlots(sender);
update_state = 1;
update_config = 1;
}
sender->flags &= ~REDIS_NODE_MASTER; sender->flags &= ~REDIS_NODE_MASTER;
sender->flags |= REDIS_NODE_SLAVE; sender->flags |= REDIS_NODE_SLAVE;
if (sender->numslaves) clusterNodeResetSlaves(sender); if (sender->numslaves) clusterNodeResetSlaves(sender);
@ -1629,6 +1647,18 @@ int clusterDelSlot(int slot) {
return REDIS_OK; return REDIS_OK;
} }
/* Delete all the slots associated with the specified node.
* The number of deleted slots is returned. */
int clusterDelNodeSlots(clusterNode *node) {
int deleted = 0, j;
for (j = 0; j < REDIS_CLUSTER_SLOTS; j++) {
if (clusterNodeGetSlotBit(node,j)) clusterDelSlot(j);
deleted++;
}
return deleted;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Cluster state evaluation function * Cluster state evaluation function
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */