gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Handle role change error in cluster setslot when migrating the last slot away with allow-replica-migration enabled (#466)

Browse Source
This commit is contained in:
Ping Xie 2024-05-09 18:12:55 -07:00 committed by GitHub
parent 8048abb2fd
commit 138a7d9846
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cluster_legacy.c
View File

@ -6320,7 +6320,7 @@ int clusterParseSetSlotCommand(client *c, int *slot_out, clusterNode **node_out,
return 1; return 1;
} }
void clusterSetSlotCommand(client *c) { void clusterCommandSetSlot(client *c) {
int slot; int slot;
int timeout_ms; int timeout_ms;
clusterNode *n; clusterNode *n;
@ -6575,7 +6575,7 @@ int clusterCommandSpecial(client *c) {
/* SETSLOT 10 IMPORTING <node ID> */ /* SETSLOT 10 IMPORTING <node ID> */
/* SETSLOT 10 STABLE */ /* SETSLOT 10 STABLE */
/* SETSLOT 10 NODE <node ID> */ /* SETSLOT 10 NODE <node ID> */
clusterSetSlotCommand(c); clusterCommandSetSlot(c);
} else if (!strcasecmp(c->argv[1]->ptr,"bumpepoch") && c->argc == 2) { } else if (!strcasecmp(c->argv[1]->ptr,"bumpepoch") && c->argc == 2) {
/* CLUSTER BUMPEPOCH */ /* CLUSTER BUMPEPOCH */
int retval = clusterBumpConfigEpochWithoutConsensus(); int retval = clusterBumpConfigEpochWithoutConsensus();

25
src/valkey-cli.c
View File

@ -5241,13 +5241,30 @@ static int clusterManagerMoveSlot(clusterManagerNode *source,
/* Inform the source node. If the source node has just lost its last /* Inform the source node. If the source node has just lost its last
* slot and the target node has already informed the source node, the * slot and the target node has already informed the source node, the
* source node has turned itself into a replica. This is not an error in * source node has turned itself into a replica. This is not an error in
* this scenario so we ignore it. See issue #9223. */ * this scenario so we ignore it. See issue #9223.
*
* Another acceptable error can arise now that the primary pre-replicates
* `cluster setslot` commands to replicas while blocking the client on the
* primary. This change enhances the reliability of `cluster setslot` in
* the face of primary failures. However, while our client is blocked on
* the primary awaiting replication, the primary might become a replica
* for the same reason as mentioned above, resulting in the client being
* unblocked with the role change error. */
success = clusterManagerSetSlot(source, target, slot, "node", err); success = clusterManagerSetSlot(source, target, slot, "node", err);
const char *acceptable = "ERR Please use SETSLOT only with masters."; if (!success && err) {
if (!success && err && !strncmp(*err, acceptable, strlen(acceptable))) { const char *acceptable[] = {
"ERR Please use SETSLOT only with masters.",
"UNBLOCKED"};
for (size_t i = 0; i < sizeof(acceptable)/sizeof(acceptable[0]); i++) {
if (!strncmp(*err, acceptable[i], strlen(acceptable[i]))) {
zfree(*err); zfree(*err);
*err = NULL; *err = NULL;
} else if (!success && err) { success = 1;
break;
}
}
}
if (!success && err) {
return 0; return 0;
} }