summaryrefslogtreecommitdiff
path: root/startYACY.sh
diff options
context:
space:
mode:
authorMichael Peter Christen <mc@yacy.net>2013-01-21 17:55:28 +0100
committerMichael Peter Christen <mc@yacy.net>2013-01-21 17:55:28 +0100
commit9b5bdae1b4bac9abd803dd195fc824b75bf2ad21 (patch)
treed47c43ffb959b472751635ed5ab48182a6f89f81 /startYACY.sh
parenteb68a30947c9dfd99f45bfa2a67bf9193b715161 (diff)
Reverted setting of MMapDirectoryFactory from solrconfig; see
http://forum.yacy-websuche.de/viewtopic.php?p=27509#p27509 Instead, in the start script is checked if the host is a 64 host and -Dsolr.directoryFactory=solr.MMapDirectoryFactory is set as java option Reverted the ramBufferSizeMB setting (this was not enabled anyway) because that may be too much memory for small peers and embedded systems. Activated the mergeFactor 4; this was commented out by mistake
Diffstat (limited to 'startYACY.sh')
-rwxr-xr-xstartYACY.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/startYACY.sh b/startYACY.sh
index 8e80a8f56..5685f8dc3 100755
--- a/startYACY.sh
+++ b/startYACY.sh
@@ -138,6 +138,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 -Dsolr.directoryFactory=solr.MMapDirectoryFactory"; fi
+
if [ ! -f $CONFIGFILE -a -f DATA/SETTINGS/httpProxy.conf ]
then
# old config if new does not exist