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

Merge branch 'diffbot-testing' into testing

Browse Source
This commit is contained in:
Matt 2015-11-24 10:03:05 -07:00
commit ada7bb8eb9
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Collectiondb.cpp
View File

@ -333,6 +333,9 @@ bool Collectiondb::addExistingColl ( char *coll, collnum_t collnum ) {
if ( cr->m_isCustomCrawl ) {
cr->m_getLinkInfo = false;
cr->m_computeSiteNumInlinks = false;
// limit each shard to 5 spiders per collection to prevent
// ppl from spidering the web and hogging up resources
cr->m_maxNumSpiders = 5;
}
// we need to compile the regular expressions or update the url

12
RdbBase.cpp
View File

@ -1607,8 +1607,8 @@ bool RdbBase::attemptMerge ( int32_t niceness, bool forceMergeAll, bool doLog ,
if ( ! m_mergeUrgent && numFiles - 14 >= m_minToMerge ) {
m_mergeUrgent = true;
if ( doLog )
log(LOG_INFO,"merge: Entering urgent merge mode for %s.",
m_dbname);
log(LOG_INFO,"merge: Entering urgent merge mode for %s "
"coll=%s.", m_dbname,m_coll);
g_numUrgentMerges++;
}
@ -1811,7 +1811,8 @@ void RdbBase::gotTokenForMerge ( ) {
m_mergeUrgent = true;
if ( m_doLog )
log(LOG_INFO,
"merge: Entering urgent merge mode for %s.", m_dbname);
"merge: Entering urgent merge mode (2) for %s coll=%s.",
m_dbname,m_coll);
g_numUrgentMerges++;
}
// tfndb has his own merge class since titledb merges write tfndb recs
@ -1894,6 +1895,11 @@ void RdbBase::gotTokenForMerge ( ) {
log(LOG_LOGIC,"merge: attemptMerge: Resuming. bad "
"engineer for %s coll=%s",m_dbname,m_coll);
//g_msg35.releaseToken();
if ( m_mergeUrgent ) {
log("merge: leaving urgent merge mode");
g_numUrgentMerges--;
m_mergeUrgent = false;
}
return false;
}
// make a log note