Merge pull request #93 from Snapchat/fix_race_trackchanges

Fix a race in processChanges/trackChanges with rdbLoadRio by acquirin…
2022-08-22 13:35:10 -04:00 · 2022-08-22 13:35:10 -04:00 · 6bb155a989
commit 6bb155a989
parent 23f92fa94c fce669e1ac
1 changed files with 3 additions and 0 deletions
--- a/src/server.cpp
+++ b/src/server.cpp
@ -3021,8 +3021,11 @@ void afterSleep(struct aeEventLoop *eventLoop) {

        serverAssert(serverTL->gcEpoch.isReset());
        serverTL->gcEpoch = g_pserver->garbageCollector.startEpoch();
+
+        aeAcquireLock();
        for (int idb = 0; idb < cserver.dbnum; ++idb)
            g_pserver->db[idb]->trackChanges(false);
+        aeReleaseLock();

        serverTL->disable_async_commands = false;
    }