fix resuming a killed merge

This commit is contained in:
Matt Wells
2015-09-12 08:01:40 -07:00
parent 37c3cc5d8d
commit a29cf8c787
2 changed files with 7 additions and 6 deletions

@ -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.

@ -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;