raise mem table ptrs from 1.2M to 3M. shard 22 was suffering

really slow mem ops because of it.
This commit is contained in:
Matt Wells 2015-06-14 11:34:13 -07:00
parent c54e9cd96e
commit 5f84ad2c5d
2 changed files with 4 additions and 1 deletions

View File

@ -537,7 +537,7 @@ void Mem::addMem ( void *mem , int32_t size , const char *note , char isnew ) {
if ( ! s_initialized ) {
//m_memtablesize = m_maxMem / 6510;
// support 1.2M ptrs for now. good for about 8GB
m_memtablesize = 1200*1024;//m_maxMem / 6510;
m_memtablesize = 3000*1024;//m_maxMem / 6510;
//if ( m_maxMem < 8000000000 ) { char *xx=NULL;*xx=0; }
}

View File

@ -1359,6 +1359,9 @@ void RdbBase::attemptMerge ( int32_t niceness, bool forceMergeAll, bool doLog ,
if ( g_merge.m_isSuspended ) return;
if ( g_merge2.m_isSuspended ) return;
// shutting down? do not start another merge then
if ( g_process.m_mode == EXIT_MODE ) return;
// sanity checks
if ( g_loop.m_inQuickPoll ) {
log("rdb: cant attempt merge in quickpoll");