forked from Mirrors/privacore-open-source-search-engine
fix resuming a killed merge
This commit is contained in:
2
Conf.cpp
2
Conf.cpp
@ -369,7 +369,7 @@ bool Conf::init ( char *dir ) { // , int32_t hostId ) {
|
||||
g_conf.m_forceIt = false;
|
||||
|
||||
// always turn on threads if live
|
||||
if ( g_conf.m_isLive ) g_conf.m_useThreads = true;
|
||||
//if ( g_conf.m_isLive ) g_conf.m_useThreads = true;
|
||||
// disable this at startup always... no since might have crashed
|
||||
// in the middle of a test. and we just turn on spiders again when
|
||||
// already in test mode otherwise hostid #0 will erase all the files.
|
||||
|
11
RdbMap.cpp
11
RdbMap.cpp
@ -1295,12 +1295,13 @@ void RdbMap::reduceMemFootPrint () {
|
||||
for ( ; s && *s && ! is_digit(*s) ; s++ );
|
||||
int id = 0;
|
||||
if ( s ) id = atoi(s);
|
||||
if ( id && (id % 2) == 0 ) return;
|
||||
// id can be zero like for spiderdb0000.map
|
||||
if ( (id % 2) == 0 ) return;
|
||||
|
||||
// log("map: reducing mem footprint for %s/%s",
|
||||
// m_file.getDir(),
|
||||
// m_file.getFilename());
|
||||
|
||||
// log("map: reducing mem footprint for %s/%s",
|
||||
// m_file.getDir(),
|
||||
// m_file.getFilename());
|
||||
|
||||
// seems kinda buggy now..
|
||||
m_reducedMem = true;
|
||||
//return;
|
||||
|
Reference in New Issue
Block a user