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

Merge pull request #4075 from sgn1/brpop_keys

Browse Source 
Fix Issues in blocking commands in cluster mode.
This commit is contained in:
Salvatore Sanfilippo 2017-06-27 17:51:19 +02:00 committed by GitHub
commit 634c64dd18
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cluster.c
View File

@ -5418,8 +5418,9 @@ int clusterRedirectBlockedClientIfNeeded(client *c) {
return 1; return 1;
} }
/* All keys must belong to the same slot, so check first key only. */
di = dictGetIterator(c->bpop.keys); di = dictGetIterator(c->bpop.keys);
while((de = dictNext(di)) != NULL) { if ((de = dictNext(di)) != NULL) {
robj *key = dictGetKey(de); robj *key = dictGetKey(de);
int slot = keyHashSlot((char*)key->ptr, sdslen(key->ptr)); int slot = keyHashSlot((char*)key->ptr, sdslen(key->ptr));
clusterNode *node = server.cluster->slots[slot]; clusterNode *node = server.cluster->slots[slot];
@ -5437,6 +5438,7 @@ int clusterRedirectBlockedClientIfNeeded(client *c) {
clusterRedirectClient(c,node,slot, clusterRedirectClient(c,node,slot,
CLUSTER_REDIR_MOVED); CLUSTER_REDIR_MOVED);
} }
dictReleaseIterator(di);
return 1; return 1;
} }
} }

2
src/server.c
View File

@ -152,7 +152,7 @@ struct redisCommand redisCommandTable[] = {
{"linsert",linsertCommand,5,"wm",0,NULL,1,1,1,0,0}, {"linsert",linsertCommand,5,"wm",0,NULL,1,1,1,0,0},
{"rpop",rpopCommand,2,"wF",0,NULL,1,1,1,0,0}, {"rpop",rpopCommand,2,"wF",0,NULL,1,1,1,0,0},
{"lpop",lpopCommand,2,"wF",0,NULL,1,1,1,0,0}, {"lpop",lpopCommand,2,"wF",0,NULL,1,1,1,0,0},
{"brpop",brpopCommand,-3,"ws",0,NULL,1,1,1,0,0}, {"brpop",brpopCommand,-3,"ws",0,NULL,1,-2,1,0,0},
{"brpoplpush",brpoplpushCommand,4,"wms",0,NULL,1,2,1,0,0}, {"brpoplpush",brpoplpushCommand,4,"wms",0,NULL,1,2,1,0,0},
{"blpop",blpopCommand,-3,"ws",0,NULL,1,-2,1,0,0}, {"blpop",blpopCommand,-3,"ws",0,NULL,1,-2,1,0,0},
{"llen",llenCommand,2,"rF",0,NULL,1,1,1,0,0}, {"llen",llenCommand,2,"rF",0,NULL,1,1,1,0,0},