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

Merge pull request #99 from Snapchat/atlas_fixes

Browse Source 
Atlas fixes
This commit is contained in:
John Sully 2022-08-29 21:22:52 -04:00 committed by GitHub Enterprise
commit 5cfbd72e7d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server.cpp
View File

@ -2795,6 +2795,8 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
AeLocker locker; AeLocker locker;
int iel = ielFromEventLoop(eventLoop); int iel = ielFromEventLoop(eventLoop);
tlsProcessPendingData();
locker.arm(); locker.arm();
/* end any snapshots created by fast async commands */ /* end any snapshots created by fast async commands */
@ -2825,7 +2827,6 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
uint64_t processed = 0; uint64_t processed = 0;
int aof_state = g_pserver->aof_state; int aof_state = g_pserver->aof_state;
locker.disarm(); locker.disarm();
processed += tlsProcessPendingData();
processed += handleClientsWithPendingWrites(iel, aof_state); processed += handleClientsWithPendingWrites(iel, aof_state);
locker.arm(); locker.arm();
processed += freeClientsInAsyncFreeQueue(iel); processed += freeClientsInAsyncFreeQueue(iel);
@ -2836,13 +2837,6 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
/* Handle precise timeouts of blocked clients. */ /* Handle precise timeouts of blocked clients. */
handleBlockedClientsTimeout(); handleBlockedClientsTimeout();
/* Handle TLS pending data. (must be done before flushAppendOnlyFile) */
if (tlsHasPendingData()) {
locker.disarm();
tlsProcessPendingData();
locker.arm();
}
/* If tls still has pending unread data don't sleep at all. */ /* If tls still has pending unread data don't sleep at all. */
aeSetDontWait(eventLoop, tlsHasPendingData()); aeSetDontWait(eventLoop, tlsHasPendingData());
@ -2908,7 +2902,7 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
static thread_local bool fFirstRun = true; static thread_local bool fFirstRun = true;
// note: we also copy the DB pointer in case a DB swap is done while the lock is released // note: we also copy the DB pointer in case a DB swap is done while the lock is released
std::vector<redisDb*> vecdb; // note we cache the database pointer in case a dbswap is done while the lock is released std::vector<redisDb*> vecdb; // note we cache the database pointer in case a dbswap is done while the lock is released
if (cserver.storage_memory_model == STORAGE_WRITETHROUGH && g_pserver->m_pstorageFactory != nullptr && !g_pserver->loading) if (cserver.storage_memory_model == STORAGE_WRITETHROUGH && !g_pserver->loading)
{ {
if (!fFirstRun) { if (!fFirstRun) {
mstime_t storage_process_latency; mstime_t storage_process_latency;