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

Merge pull request #4128 from leonchen83/unstable

Browse Source 
fix mismatch argument and return wrong value of clusterDelNodeSlots
This commit is contained in:
Salvatore Sanfilippo 2017-07-24 14:18:28 +02:00 committed by GitHub
commit d9565379da
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cluster.c
View File

@ -3602,8 +3602,10 @@ int clusterDelNodeSlots(clusterNode *node) {
int deleted = 0, j; int deleted = 0, j;
for (j = 0; j < CLUSTER_SLOTS; j++) { for (j = 0; j < CLUSTER_SLOTS; j++) {
if (clusterNodeGetSlotBit(node,j)) clusterDelSlot(j); if (clusterNodeGetSlotBit(node,j)) {
deleted++; clusterDelSlot(j);
deleted++;
}
} }
return deleted; return deleted;
} }
@ -4195,7 +4197,7 @@ void clusterCommand(client *c) {
} }
if ((n = clusterLookupNode(c->argv[4]->ptr)) == NULL) { if ((n = clusterLookupNode(c->argv[4]->ptr)) == NULL) {
addReplyErrorFormat(c,"I don't know about node %s", addReplyErrorFormat(c,"I don't know about node %s",
(char*)c->argv[3]->ptr); (char*)c->argv[4]->ptr);
return; return;
} }
server.cluster->importing_slots_from[slot] = n; server.cluster->importing_slots_from[slot] = n;