From 59f07eae0075863aa5bc9ac142b47ff81f99a6a1 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sat, 23 Jun 2012 13:35:57 +0000
Subject: [PATCH] Make CMS garbage collector the default for both AS and DSS
and add JAVA_MEM_OPTS to the DSS.
SVN: 25839
---
datastore_server/dist/datastore_server.sh | 2 +-
datastore_server/dist/etc/datastore_server.conf | 7 ++++++-
openbis/dist/server/openbis.conf | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/datastore_server/dist/datastore_server.sh b/datastore_server/dist/datastore_server.sh
index cf66a0bdb54..b8e1260d790 100755
--- a/datastore_server/dist/datastore_server.sh
+++ b/datastore_server/dist/datastore_server.sh
@@ -145,7 +145,7 @@ command=$1
# Build classpath from $LIB_FOLDER and $EXT_LIB_FOLDER content. First JAR is datastore_server.jar because it has to appear before cifex.jar
CP=`echo $LIB_FOLDER/datastore_server.jar $LIB_FOLDER/*.jar $EXT_LIB_FOLDER/*.jar | sed 's/ /:/g'`
-CMD="${JAVA_BIN} ${JAVA_OPTS} -classpath $CP ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"
+CMD="${JAVA_BIN} ${JAVA_OPTS} ${JAVA_MEM_OPTS} -classpath $CP ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"
# ensure that we ignore a possible prefix "--" for any command
command="${command#--*}"
diff --git a/datastore_server/dist/etc/datastore_server.conf b/datastore_server/dist/etc/datastore_server.conf
index 54bf425c8be..65b8ef5079b 100644
--- a/datastore_server/dist/etc/datastore_server.conf
+++ b/datastore_server/dist/etc/datastore_server.conf
@@ -8,10 +8,15 @@
#JAVA_HOME=${JAVA_HOME:=/usr/java/latest}
#
-# Options to the JRE
+# General options to the JRE
#
JAVA_OPTS=${JAVA_OPTS:=-server -d64 -Djavax.net.ssl.trustStore=etc/openBIS.keystore}
+#
+# Memory options to the JRE
+#
+JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
+
#
# Maximal number of log files to keep
#
diff --git a/openbis/dist/server/openbis.conf b/openbis/dist/server/openbis.conf
index 6c5055b8023..58b74599d9e 100644
--- a/openbis/dist/server/openbis.conf
+++ b/openbis/dist/server/openbis.conf
@@ -15,4 +15,4 @@ JAVA_OPTS=${JAVA_OPTS:=-server -d64 -Djavax.net.ssl.trustStore=etc/openBIS.keyst
#
# Memory options to the JRE
#
-JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m"
+JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
--
GitLab