Permalink
Browse files

Cluster: fix conditional generating TRYAGAIN error.

  • Loading branch information...
1 parent 36676c2 commit 6984692060106de666ee89d092163075282c6498 @antirez committed Mar 7, 2014
Showing with 5 additions and 4 deletions.
  1. +5 −4 src/cluster.c
View
@@ -3939,13 +3939,14 @@ clusterNode *getNodeByQuery(redisClient *c, struct redisCommand *cmd, robj **arg
return server.cluster->migrating_slots_to[slot];
}
- /* If we are receiving the slot, we have all the keys, and the client
- * correctly flagged the request as "ASKING", we can serve
- * the request, otherwise the only option is to send a TRYAGAIN error. */
+ /* If we are receiving the slot, and the client correctly flagged the
+ * request as "ASKING", we can serve the request. However if the request
+ * involves multiple keys and we don't have them all, the only option is
+ * to send a TRYAGAIN error. */
if (importing_slot &&
(c->flags & REDIS_ASKING || cmd->flags & REDIS_CMD_ASKING))
{
- if (missing_keys) {
+ if (multiple_keys && missing_keys) {
if (error_code) *error_code = REDIS_CLUSTER_REDIR_UNSTABLE;
return NULL;
} else {

0 comments on commit 6984692

Please sign in to comment.