Mirrors/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2025-07-17 08:26:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

disabled automatic performance setting change

Browse Source 
- during crawl start
- each indexing cycle
- for delay values
- for short memory cycles

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3634 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
orbiter
2007-05-02 15:39:27 +00:00
parent b9add5cf37
commit dd44a1394f
5 changed files with 12 additions and 32 deletions

11
htroot/IndexCreate_p.html

@ -203,17 +203,6 @@
</tr>
-->
<tr valign="top" class="TableCellLight">
<td>Wanted Performance:</td>
<td>
<input type="radio" name="crawlingPerformance" id="maximum" value="maximum" #(crawlingSpeedMaxChecked)#::checked="checked"#(/crawlingSpeedMaxChecked)# /><label for="maximum">maximum</label><br />
<input type="radio" name="crawlingPerformance" id="custom" value="custom" #(crawlingSpeedCustChecked)#::checked="checked"#(/crawlingSpeedCustChecked)# /><label for="custom">custom</label>: <input name="customPPM" type="text" size="4" maxlength="4" value="#[customPPMdefault]#" />PPM<br />
<input type="radio" name="crawlingPerformance" id="minimum" value="minimum" #(crawlingSpeedMinChecked)#::checked="checked"#(/crawlingSpeedMinChecked)# /><label for="minimum"><nobr>optimal as background process</nobr></label>
</td>
<td colspan="3">
Set wanted level of computing power, used for this and other running crawl tasks. (PPM = pages per minute)
</td>
</tr>
<tr valign="top" class="TableCellDark">
<td colspan="5"><input type="submit" name="crawlingstart" value="Start New Crawl" /></td>
</tr>
</table>

2
htroot/PerformanceQueues_p.html

@ -52,7 +52,7 @@
<td align="right"><input name="#[threadname]#_idlesleep" size="7" maxlength="7" value="#[idlesleep]#" /> milliseconds</td>
<td align="right"><input name="#[threadname]#_busysleep" size="7" maxlength="7" value="#[busysleep]#" /> milliseconds</td>
<td align="right"><input name="#[threadname]#_memprereq" size="7" maxlength="10" value="#[memprereq]#" #(disabled)#:: disabled="disabled"#(/disabled)# /> kbytes</td>
<td align="left">#[longdescr]#</td>
<td align="left">#[longdescr]##(recommendation)#::<br>recommended: #[value]##(/recommendation)#</td>
</tr>
#{/table}#
<tr class="TableCellLight">

4
htroot/PerformanceQueues_p.java

@ -174,7 +174,9 @@ public class PerformanceQueues_p {
prop.put("table_" + c + "_busysleep", busysleep);
prop.put("table_" + c + "_memprereq", memprereq / 1024);
// disallow setting of memprereq for indexer to prevent db from throwing OOMs
prop.put("table_" + c + "_disabled", (threadName.endsWith("_indexing")) ? 1 : 0);
prop.put("table_" + c + "_disabled", /*(threadName.endsWith("_indexing")) ? 1 :*/ 0);
prop.put("table_" + c + "_recommendation", (threadName.endsWith("_indexing")) ? 1 : 0);
prop.put("table_" + c + "_recommendation_value", (threadName.endsWith("_indexing")) ? ((switchboard.wordIndex.minMem() + 2 * 1024 * 1024)/1024) : 0);
c++;
}
prop.put("table", c);

2
htroot/WatchCrawler_p.java

@ -143,8 +143,6 @@ public class WatchCrawler_p {
boolean xpstopw = post.get("xpstopw", "off").equals("on");
env.setConfig("xpstopw", (xpstopw) ? "true" : "false");
setPerformance(switchboard, post);
String crawlingMode = post.get("crawlingMode","url");
if (crawlingMode.equals("url")) {
// getting the crawljob start url

25
source/de/anomic/plasma/plasmaSwitchboard.java

@ -1060,11 +1060,10 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
wordIndex.setWordFlushSize((int) getConfigLong("wordFlushSize", 1000));
// set a minimum amount of memory for the indexer thread
long memprereq = Math.max(getConfigLong(INDEXER_MEMPREREQ, 0), wordIndex.minMem());
long memprereq1 = memprereq + (memprereq / 8) + 2 * 1024 * 1024;
setConfig(INDEXER_MEMPREREQ, memprereq);
kelondroRecords.setCacheGrowStati(memprereq1, memprereq);
kelondroCache.setCacheGrowStati(memprereq1, memprereq);
long memprereq = wordIndex.minMem();
//setConfig(INDEXER_MEMPREREQ, memprereq);
kelondroRecords.setCacheGrowStati(memprereq + 2 * 1024 * 1024, memprereq);
kelondroCache.setCacheGrowStati(memprereq + 2 * 1024 * 1024, memprereq);
// make parser
log.logConfig("Starting Parser");
@ -1699,11 +1698,6 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
log.logFine("deQueue: online caution, omitting resource stack processing");
return false;
}
if ((sbQueue.size() == 0) && ((getThread(CRAWLJOB_LOCAL_CRAWL).getJobCount() == 0))) {
long sleep = getConfigLong(INDEX_DIST_BUSYSLEEP, 6000);
setPerformance((int) Math.max(120, 60000 / (sleep==0?1:sleep))); // if there is no activity, set low performance
}
// flush some entries from the RAM cache
if (sbQueue.size() == 0) wordIndex.flushCacheSome(); // permanent flushing only if we are not busy
@ -1861,13 +1855,10 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
// set new memory limit for indexer thread
long memprereq = Math.max(getConfigLong(INDEXER_MEMPREREQ, 0), wordIndex.minMem());
setConfig(INDEXER_MEMPREREQ, memprereq);
setThreadPerformance(INDEXER,
getConfigLong(INDEXER_IDLESLEEP, 0),
getConfigLong(INDEXER_BUSYSLEEP, 0),
memprereq);
kelondroRecords.setCacheGrowStati(memprereq + (memprereq / 8) + 2 * 1024 * 1024, memprereq);
kelondroCache.setCacheGrowStati(memprereq + (memprereq / 8) + 2 * 1024 * 1024, memprereq);
//setConfig(INDEXER_MEMPREREQ, memprereq);
//setThreadPerformance(INDEXER, getConfigLong(INDEXER_IDLESLEEP, 0), getConfigLong(INDEXER_BUSYSLEEP, 0), memprereq);
kelondroRecords.setCacheGrowStati(memprereq + 2 * 1024 * 1024, memprereq);
kelondroCache.setCacheGrowStati(memprereq + 2 * 1024 * 1024, memprereq);
// update the cluster set
this.clusterhashes = yacyCore.seedDB.clusterHashes(getConfig("cluster.peers.yacydomain", ""));