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

Fix crash in load with storage provider set

Browse Source 
Former-commit-id: 6990818b7ca647819b50ae04224778e6f8f12a1a
This commit is contained in:
John Sully 2021-08-11 01:19:39 +00:00
parent c77ce968c5
commit c6a0c7b04f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rdb.cpp
View File

@ -3195,8 +3195,10 @@ int rdbLoadRio(rio *rdb, int rdbflags, rdbSaveInfo *rsi) {
ckeysLoaded++; ckeysLoaded++;
if (g_pserver->m_pstorageFactory && (ckeysLoaded % 128) == 0) if (g_pserver->m_pstorageFactory && (ckeysLoaded % 128) == 0)
{ {
g_pserver->garbageCollector.endEpoch(serverTL->gcEpoch); if (!serverTL->gcEpoch.isReset()) {
serverTL->gcEpoch = g_pserver->garbageCollector.startEpoch(); g_pserver->garbageCollector.endEpoch(serverTL->gcEpoch);
serverTL->gcEpoch = g_pserver->garbageCollector.startEpoch();
}
} }
if (g_pserver->key_load_delay) if (g_pserver->key_load_delay)