From 8de3f55a7a9bfe14335c7d9abe9cd8183eb2ead9 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Thu, 19 Dec 2013 09:07:04 +0100 Subject: [PATCH] removed malicious java start arguments in debian start script which had been removed from the other start scripts recently. The reason to do so was a comparisment of a debian-installed YaCy with 20 million document which crashed after 10 hours with the debian start script, but did not crash with the startYACY.sh start script. Both scripts now use the same java start arguments. Added also the Solr MMapDirectoryFactory switch which was missing so far in the debian start script. --- addon/yacyInit.m4 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addon/yacyInit.m4 b/addon/yacyInit.m4 index c866781f7..cd53d5d25 100644 --- a/addon/yacyInit.m4 +++ b/addon/yacyInit.m4 @@ -57,7 +57,8 @@ SHUTDOWN_TIMEOUT=50 # Default niceness if not set in config file NICE_VAL=0 -JAVA_ARGS="-server -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseGCOverheadLimit -XX:+UseAdaptiveSizePolicy -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8" +JAVA_ARGS="-server -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8" + #check if system supports large memory pages and enable it if possible HUGEPAGESTOTAL="$(cat /proc/meminfo | grep HugePages_Total | sed s/[^0-9]//g)" if [ -n "$HUGEPAGESTOTAL" ] && [ $HUGEPAGESTOTAL -ne 0 ] @@ -65,6 +66,9 @@ then JAVA_ARGS="$JAVA_ARGS -XX:+UseLargePages" fi +#turn on MMap for Solr if OS is a 64bit OS +if [ -n "`uname -m | grep 64`" ]; then JAVA_ARGS="$JAVA_ARGS -d64 -Dsolr.directoryFactory=solr.MMapDirectoryFactory"; fi + ifdef(`openSUSE', `dnl . /etc/rc.status rc_reset