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

We need to send keepalives to masters while waiting to prevent disconnects

Browse Source 
Former-commit-id: 7cbd6758b1042198c14ca9e8da0f1f7bc05df93d
This commit is contained in:
John Sully 2021-09-01 04:15:59 +00:00
parent 40d5a2db44
commit 29518a1399
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rdb.cpp
View File

@ -2619,6 +2619,7 @@ class rdbAsyncWorkThread
std::atomic<bool> workerThreadDone;
std::thread m_thread;
long long now;
long long lastPing = -1;
static void listFreeMethod(const void *v) {
delete reinterpret_cast<const rdbInsertJob*>(v);
@ -2654,7 +2655,7 @@ public:
l.unlock();
usleep(1);
pauseExecution();
processEventsWhileBlocked(serverTL - g_pserver->rgthreadvar);
ProcessWhileBlocked();
resumeExecution();
l.lock();
}
@ -2685,6 +2686,23 @@ public:
cv.notify_one();
}
void ProcessWhileBlocked() {
if ((mstime() - lastPing) > 1000) { // Ping if its been a second or longer
listIter li;
listNode *ln;
listRewind(g_pserver->masters, &li);
while ((ln = listNext(&li)))
{
struct redisMaster *mi = (struct redisMaster*)listNodeValue(ln);
if (mi->masterhost && mi->repl_state == REPL_STATE_TRANSFER)
replicationSendNewlineToMaster(mi);
}
lastPing = mstime();
}
processEventsWhileBlocked(serverTL - g_pserver->rgthreadvar);
}
size_t ckeys() { return ckeysLoaded; }
size_t endWork() {
@ -2698,14 +2716,14 @@ public:
while (!workerThreadDone) {
usleep(10);
pauseExecution();
processEventsWhileBlocked(serverTL - g_pserver->rgthreadvar);
ProcessWhileBlocked();
resumeExecution();
}
}
m_thread.join();
while (cstorageWritesInFlight.load(std::memory_order_seq_cst)) {
usleep(10);
processEventsWhileBlocked(serverTL - g_pserver->rgthreadvar);
ProcessWhileBlocked();
}
fLaunched = false;
fExit = false;