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

@@ -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#--*}"

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
 #

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"