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

Fix over pessimistic checks that prevent replicas from serving mget

Browse Source
This commit is contained in:
John Sully 2023-09-20 19:04:20 +00:00 committed by John Sully
parent 9251f1c244
commit c6e20ea396
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cluster.cpp
View File

@ -5952,7 +5952,6 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in
numkeys = getKeysFromCommand(mcmd,margv,margc,&result); numkeys = getKeysFromCommand(mcmd,margv,margc,&result);
keyindex = result.keys; keyindex = result.keys;
bool fFirstKeyThisServer = false;
for (j = 0; j < numkeys; j++) { for (j = 0; j < numkeys; j++) {
robj *thiskey = margv[keyindex[j]]; robj *thiskey = margv[keyindex[j]];
int thisslot = keyHashSlot((char*)ptrFromObj(thiskey), int thisslot = keyHashSlot((char*)ptrFromObj(thiskey),
@ -5988,20 +5987,13 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in
} else if (g_pserver->cluster->importing_slots_from[slot] != NULL) { } else if (g_pserver->cluster->importing_slots_from[slot] != NULL) {
importing_slot = 1; importing_slot = 1;
} }
if (n == myself && !importing_slot && !migrating_slot) {
fFirstKeyThisServer = true;
}
} else { } else {
/* If it is not the first key, make sure it is exactly /* If it is not the first key, make sure it is exactly
* the same key as the first we saw. */ * the same key as the first we saw. */
if (!equalStringObjects(firstkey,thiskey)) { if (!equalStringObjects(firstkey,thiskey)) {
clusterNode* nThisKey = g_pserver->cluster->slots[slot]; clusterNode* nThisKey = g_pserver->cluster->slots[slot];
if (fFirstKeyThisServer && nThisKey == myself && g_pserver->cluster->migrating_slots_to[slot] == nullptr && g_pserver->cluster->importing_slots_from[slot] == nullptr) {
continue;
}
if (slot != thisslot) { if (nThisKey != n || migrating_slot || importing_slot || (g_pserver->cluster->migrating_slots_to[slot] != nullptr && g_pserver->cluster->importing_slots_from[slot] != nullptr)) {
/* Error: multiple keys from different slots. */ /* Error: multiple keys from different slots. */
getKeysFreeResult(&result); getKeysFreeResult(&result);
if (error_code) if (error_code)