fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-07-30 16:01:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3133 from c2nes/check-slots-exec

Browse Source 
Ensure slots are rechecked on EXEC.
This commit is contained in:
Salvatore Sanfilippo
2016-05-05 09:32:07 +02:00
parent bb5b8d3180 e0d0fb450c
commit 7146221f38
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/redis.c
View File

@@ -2185,7 +2185,8 @@ int processCommand(redisClient *c) {
!(c->flags & REDIS_MASTER) &&
!(c->flags & REDIS_LUA_CLIENT &&
server.lua_caller->flags & REDIS_MASTER) &&
!(c->cmd->getkeys_proc == NULL && c->cmd->firstkey == 0))
!(c->cmd->getkeys_proc == NULL && c->cmd->firstkey == 0 &&
c->cmd->proc != execCommand))
{
int hashslot;
@@ -2197,7 +2198,11 @@ int processCommand(redisClient *c) {
int error_code;
clusterNode *n = getNodeByQuery(c,c->cmd,c->argv,c->argc,&hashslot,&error_code);
if (n == NULL || n != server.cluster->myself) {
flagTransaction(c);
if (c->cmd->proc == execCommand) {
discardTransaction(c);
} else {
flagTransaction(c);
}
clusterRedirectClient(c,n,hashslot,error_code);
return REDIS_OK;
}