diff options
| author | Suraj Narkhede <surajn.vnit@gmail.com> | 2017-06-22 23:52:00 -0700 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2017-06-27 18:06:02 +0200 |
| commit | 55442262e1c3fa82a51c3b8f20644569b8392fb7 (patch) | |
| tree | 72fe7168a0639989c195c0a38534eb7c0fab9aca | |
| parent | e3641c8deee1bad3ec55783e2db0ddce4283254e (diff) | |
| download | redis-55442262e1c3fa82a51c3b8f20644569b8392fb7.tar.gz | |
Fix brpop command table entry and redirect blocked clients.
| -rw-r--r-- | src/cluster.c | 3 | ||||
| -rw-r--r-- | src/server.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/cluster.c b/src/cluster.c index a72c04503..81f1bec26 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -5203,8 +5203,9 @@ int clusterRedirectBlockedClientIfNeeded(client *c) { return 1; } + /* All keys must belong to the same slot, so check first key only. */ di = dictGetIterator(c->bpop.keys); - while((de = dictNext(di)) != NULL) { + if ((de = dictNext(di)) != NULL) { robj *key = dictGetKey(de); int slot = keyHashSlot((char*)key->ptr, sdslen(key->ptr)); clusterNode *node = server.cluster->slots[slot]; diff --git a/src/server.c b/src/server.c index 3e508e9a2..7a14655fa 100644 --- a/src/server.c +++ b/src/server.c @@ -148,7 +148,7 @@ struct redisCommand redisCommandTable[] = { {"linsert",linsertCommand,5,"wm",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}, - {"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}, {"blpop",blpopCommand,-3,"ws",0,NULL,1,-2,1,0,0}, {"llen",llenCommand,2,"rF",0,NULL,1,1,1,0,0}, |