caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

CLUSTER SETSLOT implemented

Browse Source
This commit is contained in:
antirez 2011-05-04 09:31:37 +02:00
parent 66f2517feb
commit 0ba2932298
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/cluster.c
View File

@ -115,7 +115,30 @@ int clusterLoadConfig(char *filename) {
for (j = 7; j < argc; j++) { for (j = 7; j < argc; j++) {
int start, stop; int start, stop;
if ((p = strchr(argv[j],'-')) != NULL) { if (argv[j][0] == '[') {
/* Here we handle migrating / importing slots */
int slot;
char direction;
clusterNode *cn;
p = strchr(argv[j],'-');
redisAssert(p != NULL);
*p = '\0';
direction = p[1]; /* Either '>' or '<' */
slot = atoi(argv[j]+1);
p += 3;
cn = clusterLookupNode(p);
if (!cn) {
cn = createClusterNode(p,0);
clusterAddNode(cn);
}
if (direction == '>') {
server.cluster.migrating_slots_to[slot] = cn;
} else {
server.cluster.importing_slots_from[slot] = cn;
}
continue;
} else if ((p = strchr(argv[j],'-')) != NULL) {
*p = '\0'; *p = '\0';
start = atoi(argv[j]); start = atoi(argv[j]);
stop = atoi(p+1); stop = atoi(p+1);
@ -1093,10 +1116,10 @@ sds clusterGenNodesDescription(void) {
if (node->flags & REDIS_NODE_MYSELF) { if (node->flags & REDIS_NODE_MYSELF) {
for (j = 0; j < REDIS_CLUSTER_SLOTS; j++) { for (j = 0; j < REDIS_CLUSTER_SLOTS; j++) {
if (server.cluster.migrating_slots_to[j]) { if (server.cluster.migrating_slots_to[j]) {
ci = sdscatprintf(ci," [%d->%.40s]",j, ci = sdscatprintf(ci," [%d->-%.40s]",j,
server.cluster.migrating_slots_to[j]->name); server.cluster.migrating_slots_to[j]->name);
} else if (server.cluster.importing_slots_from[j]) { } else if (server.cluster.importing_slots_from[j]) {
ci = sdscatprintf(ci," [%d<-%.40s]",j, ci = sdscatprintf(ci," [%d-<-%.40s]",j,
server.cluster.importing_slots_from[j]->name); server.cluster.importing_slots_from[j]->name);
} }
} }
@ -1221,6 +1244,7 @@ void clusterCommand(redisClient *c) {
} else { } else {
addReplyError(c,"Invalid CLUSTER SETSLOT action or number of arguments"); addReplyError(c,"Invalid CLUSTER SETSLOT action or number of arguments");
} }
clusterSaveConfigOrDie();
addReply(c,shared.ok); addReply(c,shared.ok);
} else if (!strcasecmp(c->argv[1]->ptr,"info") && c->argc == 2) { } else if (!strcasecmp(c->argv[1]->ptr,"info") && c->argc == 2) {
char *statestr[] = {"ok","fail","needhelp"}; char *statestr[] = {"ok","fail","needhelp"};