diff options
| author | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2016-06-21 08:01:57 +0200 |
|---|---|---|
| committer | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2016-06-21 08:01:57 +0200 |
| commit | 59545204460d54ddcf5eaec2023cab2be4770005 (patch) | |
| tree | 6acb491e01f1c437932df5d6b8b4fa79de57a26f /sonar-application | |
| parent | 000e135cd7ae0e8293a3b1f18e60f9932db7241b (diff) | |
| parent | 13997dc0a95d2f57ce371c510f95c76219272855 (diff) | |
| download | sonarqube-59545204460d54ddcf5eaec2023cab2be4770005.tar.gz sonarqube-59545204460d54ddcf5eaec2023cab2be4770005.zip | |
Automatic merge from branch-5.6
* origin/branch-5.6:
Fix documentation of properties *.javaOpts
Diffstat (limited to 'sonar-application')
| -rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 0724b46c2c9..e2d938a2a9f 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -80,13 +80,13 @@ #-------------------------------------------------------------------------------------------------- # WEB SERVER - -# Web server is executed in a dedicated Java process. By default heap size is 768Mb. +# Web server is executed in a dedicated Java process. By default heap size is 512Mb. # Use the following property to customize JVM options. # Recommendations: # # The HotSpot Server VM is recommended. The property -server should be added if server mode -# is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html +# is not enabled by default on your environment: +# http://docs.oracle.com/javase/8/docs/technotes/guides/vm/server-class.html # #sonar.web.javaOpts=-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError @@ -126,12 +126,13 @@ #-------------------------------------------------------------------------------------------------- # COMPUTE ENGINE # The Compute Engine is responsible for processing background tasks. -# Compute Engine is executed in a dedicated Java process. By default heap size is 512Mb. +# Compute Engine is executed in a dedicated Java process. Default heap size is 512Mb. # Use the following property to customize JVM options. # Recommendations: # # The HotSpot Server VM is recommended. The property -server should be added if server mode -# is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html +# is not enabled by default on your environment: +# http://docs.oracle.com/javase/8/docs/technotes/guides/vm/server-class.html # #sonar.ce.javaOpts=-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError @@ -150,13 +151,14 @@ #-------------------------------------------------------------------------------------------------- # ELASTICSEARCH # Elasticsearch is used to facilitate fast and accurate information retrieval. -# It is executed in a dedicated Java process. +# It is executed in a dedicated Java process. Default heap size is 1Gb. # JVM options of Elasticsearch process # Recommendations: # # Use HotSpot Server VM. The property -server should be added if server mode -# is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html +# is not enabled by default on your environment: +# http://docs.oracle.com/javase/8/docs/technotes/guides/vm/server-class.html # #sonar.search.javaOpts=-Xmx1G -Xms256m -Xss256k -Djna.nosys=true \ # -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 \ |