Remove a global lock

Snapchat · Sep 25, 2023 · cdc5e8f · cdc5e8f
1 parent f0e8c6f
commit cdc5e8f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/db.cpp b/src/db.cpp
@@ -3181,7 +3181,7 @@ void redisDbPersistentData::trackChanges(bool fBulk, size_t sizeHint)
     if (fBulk)
         m_fAllChanged.fetch_add(1, std::memory_order_acq_rel);
 
-    if (sizeHint > 0)
+    if (sizeHint > 0 && aeThreadOwnsLock())
         dictExpand(m_dictChanged, sizeHint, false);
 }
 

diff --git a/src/server.cpp b/src/server.cpp
@@ -3068,10 +3068,8 @@ 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;
     }