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

Merge branch 'keydbpro_collab' into multithread_load

Browse Source 
Former-commit-id: f36e9efd8e0079650c78e1e8c19c5fa8553c8251
This commit is contained in:
John Sully 2021-08-11 02:54:02 +00:00
commit 14ab4823f0
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server.cpp
View File

@ -6757,6 +6757,7 @@ void loadDataFromDisk(void) {
serverLog(LL_NOTICE, "Loading the RDB even though we have a storage provider because the database is empty");
}
serverTL->gcEpoch = g_pserver->garbageCollector.startEpoch();
if (g_pserver->aof_state == AOF_ON) {
if (loadAppendOnlyFile(g_pserver->aof_filename) == C_OK)
serverLog(LL_NOTICE,"DB loaded from append only file: %.3f seconds",(float)(ustime()-start)/1000000);
@ -6802,6 +6803,8 @@ void loadDataFromDisk(void) {
exit(1);
}
}
g_pserver->garbageCollector.endEpoch(serverTL->gcEpoch);
serverTL->gcEpoch.reset();
}
void redisOutOfMemoryHandler(size_t allocation_size) {