gigablast/open-source-search-engine
1
0
Fork 0
mirror of https://github.com/gigablast/open-source-search-engine.git synced 2024-10-03 19:57:18 +03:00
Code Issues Projects Releases Wiki Activity

fix core when exiting while merging

Browse Source
This commit is contained in:
Matt Wells 2015-10-24 12:50:57 -07:00
parent 776b94396e
commit 66145e4396
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RdbMerge.cpp
View File

@ -635,6 +635,13 @@ void RdbMerge::doneMerging ( ) {
// then the rdbbase should be NULL i guess.
if ( saved == ENOCOLLREC ) return;
// if we are exiting then dont bother renaming the files around now.
// this prevents a core in RdbBase::incorporateMerge()
if ( g_process.m_mode == EXIT_MODE ) {
log("merge: exiting. not ending merge.");
return;
}
// get base, returns NULL and sets g_errno to ENOCOLLREC on error
RdbBase *base; if (!(base=getRdbBase(m_rdbId,m_collnum))) return;
// pass g_errno on to incorporate merge so merged file can be unlinked