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

Fix assertion in async rehash

Browse Source
This commit is contained in:
John Sully 2022-05-16 22:36:41 +00:00
parent 51d3e2cbbc
commit 9e138815a1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server.cpp
View File

@ -2109,9 +2109,11 @@ void databasesCron(bool fMainThread) {
aeAcquireLock(); aeAcquireLock();
} }
if (serverTL->rehashCtl->done.load(std::memory_order_relaxed)) {
dictCompleteRehashAsync(serverTL->rehashCtl, true /*fFree*/); dictCompleteRehashAsync(serverTL->rehashCtl, true /*fFree*/);
serverTL->rehashCtl = nullptr; serverTL->rehashCtl = nullptr;
} }
}
serverAssert(serverTL->rehashCtl == nullptr); serverAssert(serverTL->rehashCtl == nullptr);
::dict *dict = g_pserver->db[rehash_db]->dictUnsafeKeyOnly(); ::dict *dict = g_pserver->db[rehash_db]->dictUnsafeKeyOnly();