mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 175340571b into fdbf88032c

This commit is contained in:
ma2sql 2025-05-09 19:59:51 +09:00 committed by GitHub
parent fdbf88032c 175340571b
commit a4d7c3b631
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/redis-cli.c
View File

@ -5272,6 +5272,32 @@ next:
return success;
}
/* Ignore acceptable errors when moving the slot.
* See issues #9223 and 11104.
*/
static int clusterManagerIsAcceptableError(char**err, int ignore_warning)
{
// do nothing if err is NULL.
if (err == NULL) return 1;
const char *acceptables[] = {
"ERR Please use SETSLOT only with masters.",
"LOADING Redis is loading the dataset in memory"
};
const int acceptables_len = sizeof(acceptables) / sizeof(char*);
for (int i = 0; i < acceptables_len; i++) {
if (!strncmp(*err, acceptables[i], strlen(acceptables[i]))) {
if (!ignore_warning) clusterManagerLogWarn("\n*** Ignored: %s\n", *err);
zfree(*err);
*err = NULL;
return 1;
}
}
clusterManagerLogErr("\nAborted: %s\n", *err);
return 0;
}
/* Move slots between source and target nodes using MIGRATE.
*
* Options:
@ -5325,13 +5351,7 @@ static int clusterManagerMoveSlot(clusterManagerNode *source,
* source node has turned itself into a replica. This is not an error in
* this scenario so we ignore it. See issue #9223. */
success = clusterManagerSetSlot(source, target, slot, "node", err);
const char *acceptable = "ERR Please use SETSLOT only with masters.";
if (!success && err && !strncmp(*err, acceptable, strlen(acceptable))) {
zfree(*err);
*err = NULL;
} else if (!success && err) {
return 0;
}
if (!success && err && !clusterManagerIsAcceptableError(err, 0)) return 0;
/* We also inform the other nodes to avoid redirects in case the target
* node is slow to propagate the change to the entire cluster. */
@ -5343,7 +5363,7 @@ static int clusterManagerMoveSlot(clusterManagerNode *source,
if (n == target || n == source) continue; /* already done */
if (n->flags & CLUSTER_MANAGER_FLAG_SLAVE) continue;
success = clusterManagerSetSlot(n, target, slot, "node", err);
if (!success) return 0;
if (!success && err && !clusterManagerIsAcceptableError(err, 1)) return 0;
}
}
/* Update the node logical config */