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

Active replicas referencing eachother should connect one at a time

Browse Source 
Former-commit-id: c0c033a0c175eebdf2173e6e4e59e792d2fe4285
This commit is contained in:
John Sully 2020-05-31 16:03:23 -04:00
parent 8740fb79af
commit da309f7045
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/replication.cpp
View File

@ -1121,6 +1121,25 @@ void processReplconfUuid(client *c, robj *arg)
if (uuid_parse(remoteUUID, c->uuid) != 0) if (uuid_parse(remoteUUID, c->uuid) != 0)
goto LError; goto LError;
listIter liMi;
listNode *lnMi;
listRewind(g_pserver->masters, &liMi);
// Enforce a fair ordering for connection, if they attempt to connect before us close them out
// This must be consistent so that both make the same decision of who should proceed first
while ((lnMi = listNext(&liMi))) {
redisMaster *mi = (redisMaster*)listNodeValue(lnMi);
if (mi->repl_state == REPL_STATE_CONNECTED)
continue;
if (FSameUuidNoNil(mi->master_uuid, c->uuid)) {
// Decide based on UUID so both clients make the same decision of which host loses
// otherwise we may entere a loop where neither client can proceed
if (memcmp(mi->master_uuid, c->uuid, UUID_BINARY_LEN) < 0) {
freeClientAsync(c);
}
}
}
char szServerUUID[36 + 2]; // 1 for the '+', another for '\0' char szServerUUID[36 + 2]; // 1 for the '+', another for '\0'
szServerUUID[0] = '+'; szServerUUID[0] = '+';
uuid_unparse(cserver.uuid, szServerUUID+1); uuid_unparse(cserver.uuid, szServerUUID+1);