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

Fixed semantics of CLUSTER SETSLOT, SELECT now only denied in cluster mode if selected DB is not 0 so that MIGRATE still works well.

Browse Source
This commit is contained in:
antirez 2011-05-05 18:10:02 +02:00
parent 46834808fe
commit a7b058dae6
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cluster.c
View File

@ -1219,11 +1219,11 @@ void clusterCommand(redisClient *c) {
return; return;
} }
slot = (unsigned int) aux; slot = (unsigned int) aux;
if (!strcasecmp(c->argv[3]->ptr,"migrating") && c->argc == 5) {
if (server.cluster.slots[slot] != server.cluster.myself) { if (server.cluster.slots[slot] != server.cluster.myself) {
addReplyErrorFormat(c,"I'm not the owner of hash slot %u",slot); addReplyErrorFormat(c,"I'm not the owner of hash slot %u",slot);
return; return;
} }
if (!strcasecmp(c->argv[3]->ptr,"migrating") && c->argc == 5) {
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[4]->ptr); (char*)c->argv[4]->ptr);
@ -1231,6 +1231,11 @@ void clusterCommand(redisClient *c) {
} }
server.cluster.migrating_slots_to[slot] = n; server.cluster.migrating_slots_to[slot] = n;
} else if (!strcasecmp(c->argv[3]->ptr,"importing") && c->argc == 5) { } else if (!strcasecmp(c->argv[3]->ptr,"importing") && c->argc == 5) {
if (server.cluster.slots[slot] == server.cluster.myself) {
addReplyErrorFormat(c,
"I'm already the owner of hash slot %u",slot);
return;
}
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[3]->ptr);

2
src/db.c
View File

@ -317,7 +317,7 @@ void existsCommand(redisClient *c) {
void selectCommand(redisClient *c) { void selectCommand(redisClient *c) {
int id = atoi(c->argv[1]->ptr); int id = atoi(c->argv[1]->ptr);
if (server.cluster_enabled) { if (server.cluster_enabled && id != 0) {
addReplyError(c,"SELECT is not allowed in cluster mode"); addReplyError(c,"SELECT is not allowed in cluster mode");
return; return;
} }