diff --git a/defaults/yacy.init b/defaults/yacy.init index ce109aab7..f3c75cfee 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -632,11 +632,11 @@ collection=user 720_ccimport_idlesleep=100 720_ccimport_busysleep=1000 720_ccimport_memprereq=1048576 -720_ccimport_loadprereq=9.0 +720_ccimport_loadprereq=8.0 730_ccfilter_idlesleep=100 730_ccfilter_busysleep=1000 730_ccfilter_memprereq=1048576 -730_ccfilter_loadprereq=9.0 +730_ccfilter_loadprereq=8.0 80_searchresult_idlesleep=10000 80_searchresult_busysleep=200 80_searchresult_memprereq=0 @@ -644,7 +644,7 @@ collection=user 90_cleanup_idlesleep=300000 90_cleanup_busysleep=300000 90_cleanup_memprereq=0 -90_cleanup_loadprereq=3.0 +90_cleanup_loadprereq=16.0 # additional attributes: # performanceIO is a percent-value. a value of 10 means, that 10% of the busysleep time diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java index 09a6abb30..3f4c57686 100644 --- a/source/net/yacy/search/Switchboard.java +++ b/source/net/yacy/search/Switchboard.java @@ -2309,7 +2309,7 @@ public final class Switchboard extends serverSwitch { Fulltext fulltext = index.fulltext(); CollectionConfiguration collection1Configuration = fulltext.getDefaultConfiguration(); WebgraphConfiguration webgraphConfiguration = fulltext.getWebgraphConfiguration(); - if (!this.crawlJobIsPaused(SwitchboardConstants.CRAWLJOB_LOCAL_CRAWL) && MemoryControl.request(256000000L, false) && Memory.load() < 1.0f) { + if (!this.crawlJobIsPaused(SwitchboardConstants.CRAWLJOB_LOCAL_CRAWL) && MemoryControl.available() > 512L * 1024L * 1024L && Memory.load() < 2.0f) { // we optimize first because that is useful for postprocessing int proccount = 0;