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

Cluster: CLUSTER FORGET implemented.

Browse Source
This commit is contained in:
antirez 2013-02-27 17:55:59 +01:00
parent d2b8281b3f
commit d45d184118
1 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/cluster.c
View File

@ -491,6 +491,41 @@ int clusterAddNode(clusterNode *node) {
return (retval == DICT_OK) ? REDIS_OK : REDIS_ERR; return (retval == DICT_OK) ? REDIS_OK : REDIS_ERR;
} }
/* Remove a node from the cluster:
* 1) Mark all the nodes handled by it as unassigned.
* 2) Remove all the failure reports sent by this node.
* 3) Free the node, that will in turn remove it from the hash table
* and from the list of slaves of its master, if it is a slave node.
*/
void clusterDelNode(clusterNode *delnode) {
int j;
dictIterator *di;
dictEntry *de;
/* 1) Mark slots as unassigned. */
for (j = 0; j < REDIS_CLUSTER_SLOTS; j++) {
if (server.cluster->importing_slots_from[j] == delnode)
server.cluster->importing_slots_from[j] = NULL;
if (server.cluster->migrating_slots_to[j] == delnode)
server.cluster->migrating_slots_to[j] = NULL;
if (server.cluster->slots[j] == delnode)
clusterDelSlot(j);
}
/* 2) Remove failure reports. */
di = dictGetIterator(server.cluster->nodes);
while((de = dictNext(di)) != NULL) {
clusterNode *node = dictGetVal(de);
if (node == delnode) continue;
clusterNodeDelFailureReport(node,delnode);
}
dictReleaseIterator(di);
/* 3) Free the node, unlinking it from the cluster. */
freeClusterNode(delnode);
}
/* Node lookup by name */ /* Node lookup by name */
clusterNode *clusterLookupNode(char *name) { clusterNode *clusterLookupNode(char *name) {
sds s = sdsnewlen(name, REDIS_CLUSTER_NAMELEN); sds s = sdsnewlen(name, REDIS_CLUSTER_NAMELEN);
@ -1781,6 +1816,18 @@ void clusterCommand(redisClient *c) {
addReplyMultiBulkLen(c,numkeys); addReplyMultiBulkLen(c,numkeys);
for (j = 0; j < numkeys; j++) addReplyBulk(c,keys[j]); for (j = 0; j < numkeys; j++) addReplyBulk(c,keys[j]);
zfree(keys); zfree(keys);
} else if (!strcasecmp(c->argv[1]->ptr,"forget") && c->argc == 3) {
/* CLUSTER FORGET <NODE ID> */
clusterNode *n = clusterLookupNode(c->argv[2]->ptr);
if (!n) {
addReplyErrorFormat(c,"Unknown node %s", (char*)c->argv[2]->ptr);
return;
}
clusterDelNode(n);
clusterUpdateState();
clusterSaveConfigOrDie();
addReply(c,shared.ok);
} else { } else {
addReplyError(c,"Wrong CLUSTER subcommand or number of arguments"); addReplyError(c,"Wrong CLUSTER subcommand or number of arguments");
} }