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

Cluster: more correct update of slots state when PONG is received.

Browse Source
This commit is contained in:
antirez 2013-02-21 16:52:06 +01:00
parent c6da9d9fac
commit 07b6322735
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cluster.c
View File

@ -655,8 +655,7 @@ int clusterProcessPacket(clusterLink *link) {
}
}
/* Update our info about served slots if this new node is serving
* slots that are not served from our point of view. */
/* Update our info about served slots. */
if (sender && sender->flags & REDIS_NODE_MASTER) {
int newslots, j;
@ -666,6 +665,9 @@ int clusterProcessPacket(clusterLink *link) {
if (newslots) {
for (j = 0; j < REDIS_CLUSTER_SLOTS; j++) {
if (clusterNodeGetSlotBit(sender,j)) {
/* If this slot was not served, or served by a node
* in FAIL state, update the table with the new node
* caliming to serve the slot. */
if (server.cluster->slots[j] == sender) continue;
if (server.cluster->slots[j] == NULL ||
server.cluster->slots[j]->flags & REDIS_NODE_FAIL)
@ -674,6 +676,16 @@ int clusterProcessPacket(clusterLink *link) {
clusterAddSlot(sender,j);
update_state = update_config = 1;
}
} else {
/* If this slot was served by this node, but it is
* no longer claiming it, del it from the table. */
if (server.cluster->slots[j] == sender) {
/* Set the bit again before calling
* clusterDelSlot() or the assert will fail. */
clusterNodeSetSlotBit(sender,j);
clusterDelSlot(j);
update_state = update_config = 1;
}
}
}
}