diff options
| author | Jenkins CI <ci@sonarsource.com> | 2015-01-07 08:00:51 +0100 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2015-01-07 08:00:51 +0100 |
| commit | b0d7cfdb3f9cb5676813fdc568151f0d9828f8fc (patch) | |
| tree | f4ad459fbe99fda6f89789f7b6192e82e27e5979 /sonar-application/src | |
| parent | e971d2f4134adb8d47684e4f7d7ebf6469cbfc2d (diff) | |
| parent | 9a26d12dcde1596ae301590ba20ff89a7e7f5fa8 (diff) | |
| download | sonarqube-b0d7cfdb3f9cb5676813fdc568151f0d9828f8fc.tar.gz sonarqube-b0d7cfdb3f9cb5676813fdc568151f0d9828f8fc.zip | |
Automatic merge from branch-5.0
* origin/branch-5.0:
Improve documentation of memory settings
Add missing sonar-testing-harness in sonar-maven-plugin module
Fix documentation of JVM server mode
Diffstat (limited to 'sonar-application/src')
| -rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 324ed71e5f8..2b9c3dbdedd 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -75,13 +75,19 @@ #-------------------------------------------------------------------------------------------------- # WEB SERVER -# Web server is executed in a dedicated Java process. By default its heap size is 768Mb. -# Use the following property to customize JVM options. Enabling the HotSpot Server VM -# mode (-server) is recommended. +# Web server is executed in a dedicated Java process. By default heap size is 768Mb. +# 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 +# +# Set min and max memory (respectively -Xms and -Xmx) to the same value to prevent heap +# from resizing at runtime. +# #sonar.web.javaOpts=-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -# Same as previous property, but allows to not repeat all other settings -# like -Djava.awt.headless=true +# Same as previous property, but allows to not repeat all other settings like -Xmx #sonar.web.javaAdditionalOpts= # Binding IP address. For servers with more than one IP address, this property specifies which @@ -177,18 +183,24 @@ #-------------------------------------------------------------------------------------------------- -# SEARCH INDEX - +# ELASTICSEARCH # Elasticsearch is used to facilitate fast and accurate information retrieval. # It is executed in a dedicated Java process. -# JVM options. Note that enabling the HotSpot Server VM mode (-server) is recommended. +# 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 +# +# Set min and max memory (respectively -Xms and -Xmx) to the same value to prevent heap +# from resizing at runtime. +# #sonar.search.javaOpts=-Xmx1G -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true \ # -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 \ # -XX:+UseCMSInitiatingOccupancyOnly -XX:+HeapDumpOnOutOfMemoryError -# Same as previous property, but allows to not repeat all other settings -# like -Djava.awt.headless=true +# Same as previous property, but allows to not repeat all other settings like -Xmx #sonar.search.javaAdditionalOpts= # Elasticsearch port. Default is 9001. Use 0 to get a free port. @@ -244,7 +256,6 @@ #sonar.path.temp=temp - #-------------------------------------------------------------------------------------------------- # DEVELOPMENT - only for developers # The following properties MUST NOT be used in production environments. |