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

We only want one master connection in progress at a time, ensure that if the connection fails we try a different master

Browse Source 
Former-commit-id: 8a0441c14475dc54616337270e092068acaa274a
This commit is contained in:
John Sully 2020-05-30 15:13:28 -04:00
parent 63af59949e
commit 2320e632d9
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/replication.cpp
View File

@ -3747,6 +3747,18 @@ void replicationCron(void) {
listIter liMaster; listIter liMaster;
listNode *lnMaster; listNode *lnMaster;
listRewind(g_pserver->masters, &liMaster); listRewind(g_pserver->masters, &liMaster);
bool fInMasterConnection = false;
while ((lnMaster = listNext(&liMaster)) && !fInMasterConnection)
{
redisMaster *mi = (redisMaster*)listNodeValue(lnMaster);
if (mi->repl_state != REPL_STATE_NONE && mi->repl_state != REPL_STATE_CONNECTED && mi->repl_state != REPL_STATE_CONNECT) {
fInMasterConnection = true;
}
}
bool fConnectionStarted = false;
listRewind(g_pserver->masters, &liMaster);
while ((lnMaster = listNext(&liMaster))) while ((lnMaster = listNext(&liMaster)))
{ {
redisMaster *mi = (redisMaster*)listNodeValue(lnMaster); redisMaster *mi = (redisMaster*)listNodeValue(lnMaster);
@ -3785,12 +3797,14 @@ void replicationCron(void) {
} }
/* Check if we should connect to a MASTER */ /* Check if we should connect to a MASTER */
if (mi->repl_state == REPL_STATE_CONNECT) { if (mi->repl_state == REPL_STATE_CONNECT && !fInMasterConnection) {
serverLog(LL_NOTICE,"Connecting to MASTER %s:%d", serverLog(LL_NOTICE,"Connecting to MASTER %s:%d",
mi->masterhost, mi->masterport); mi->masterhost, mi->masterport);
if (connectWithMaster(mi) == C_OK) { if (connectWithMaster(mi) == C_OK) {
serverLog(LL_NOTICE,"MASTER <-> REPLICA sync started"); serverLog(LL_NOTICE,"MASTER <-> REPLICA sync started");
} }
fInMasterConnection = true;
fConnectionStarted = true;
} }
/* Send ACK to master from time to time. /* Send ACK to master from time to time.
@ -3801,6 +3815,11 @@ void replicationCron(void) {
replicationSendAck(mi); replicationSendAck(mi);
} }
if (fConnectionStarted) {
// If we cancel this handshake we want the next attempt to be a different master
listRotateHeadToTail(g_pserver->masters);
}
/* If we have attached slaves, PING them from time to time. /* If we have attached slaves, PING them from time to time.
* So slaves can implement an explicit timeout to masters, and will * So slaves can implement an explicit timeout to masters, and will
* be able to detect a link disconnection even if the TCP connection * be able to detect a link disconnection even if the TCP connection