SONAR-5204 allow server to use more than 4Gb RAM

diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf
index ca94c242a3daf5de8d455eea3a31a1fbffe56a50..dbced5fbb7f27b9baa479b1293e977dc4d956fc9 100644 (file)
--- a/sonar-application/src/main/assembly/conf/wrapper.conf
+++ b/sonar-application/src/main/assembly/conf/wrapper.conf
@@ -4,16 +4,12 @@ wrapper.java.additional.2=-XX:MaxPermSize=160m
 wrapper.java.additional.3=-XX:+HeapDumpOnOutOfMemoryError
 wrapper.java.additional.4=-Dfile.encoding=UTF-8
 wrapper.java.additional.5=-Djruby.management.enabled=false
+wrapper.java.additional.6=-Xms256M
+wrapper.java.additional.7=-Xmx512M
 
 # RECOMMENDED : uncomment if Java Virtual Machine is a JDK but not a JRE. To know which JVM you use, execute
 # 'java -version'. JDK displays 'Server VM'.
-#wrapper.java.additional.6=-server
-
-# Initial Java Heap Size (in MB)
-wrapper.java.initmemory=256
-
-# Maximum Java Heap Size (in MB)
-wrapper.java.maxmemory=512
+#wrapper.java.additional.8=-server
 
 #********************************************************************
 # Wrapper Java Properties
@@ -45,18 +41,23 @@ wrapper.java.library.path.1=./lib
 # Application parameters.  Add parameters as needed starting from 1
 wrapper.app.parameter.1=org.sonar.application.StartServer
 
+# Do not touch the 2 following properties. Memory settings are set
+# with -Xmx and -Xms (see above)
+wrapper.java.initmemory=0
+wrapper.java.maxmemory=9
+
 #********************************************************************
 # Profiling and debbuging - for development only
-# If wrapper.java.additional.6=-server is not commented, parameter ids should start from 7 instead of 6.
+# If wrapper.java.additional.7=-server is not commented, parameter ids should start from 8 instead of 7.
 #********************************************************************
 # Java remote debugging
-#wrapper.java.additional.6=-agentlib:jdwp=transport=dt_socket,server=y,address=8000
+#wrapper.java.additional.7=-agentlib:jdwp=transport=dt_socket,server=y,address=8000
 
 # JMX remote monitoring on Sun JVM (warning, security is disabled)
-#wrapper.java.additional.6=-Dcom.sun.management.jmxremote
-#wrapper.java.additional.7=-Dcom.sun.management.jmxremote.port=9005
-#wrapper.java.additional.8=-Dcom.sun.management.jmxremote.authenticate=false
-#wrapper.java.additional.9=-Dcom.sun.management.jmxremote.ssl=false
+#wrapper.java.additional.7=-Dcom.sun.management.jmxremote
+#wrapper.java.additional.8=-Dcom.sun.management.jmxremote.port=9005
+#wrapper.java.additional.9=-Dcom.sun.management.jmxremote.authenticate=false
+#wrapper.java.additional.10=-Dcom.sun.management.jmxremote.ssl=false
 
 #********************************************************************
 # Wrapper Logging Properties