diff options
| author | Eric Hartmann <hartmann.eric@gmail.com> | 2017-08-17 20:26:23 +0200 |
|---|---|---|
| committer | Eric Hartmann <hartmann.eric@gmail.com> | 2017-08-17 20:26:23 +0200 |
| commit | f98b26b3f33e0eb2788ca93a4b115585c527c737 (patch) | |
| tree | b881ecbb0a619ab597d9dd3b76a6888d2c66e3f6 | |
| parent | f37810ecfd835d0e8cb53f45aa9b2d3444fc004d (diff) | |
| download | sonarqube-f98b26b3f33e0eb2788ca93a4b115585c527c737.tar.gz sonarqube-f98b26b3f33e0eb2788ca93a4b115585c527c737.zip | |
SONAR-8798 Update memory for Elasticsearch to 512m by default
3 files changed, 7 insertions, 7 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java index c2f61f644e9..63a8bc8fb17 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java +++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java @@ -121,8 +121,8 @@ public class ProcessProperties { Properties defaults = new Properties(); defaults.put(SEARCH_HOST, InetAddress.getLoopbackAddress().getHostAddress()); defaults.put(SEARCH_PORT, "9001"); - defaults.put(SEARCH_JAVA_OPTS, "-Xms1g" + - " -Xmx1g" + + defaults.put(SEARCH_JAVA_OPTS, "-Xms512m" + + " -Xmx512m" + " -XX:+UseConcMarkSweepGC" + " -XX:CMSInitiatingOccupancyFraction=75" + " -XX:+UseCMSInitiatingOccupancyOnly" + diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 65a74e228ff..2e386d9e5c5 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -184,11 +184,11 @@ #-------------------------------------------------------------------------------------------------- # ELASTICSEARCH # Elasticsearch is used to facilitate fast and accurate information retrieval. -# It is executed in a dedicated Java process. Default heap size is 2Gb. +# It is executed in a dedicated Java process. Default heap size is 512m. # JVM options of Elasticsearch process -#sonar.search.javaOpts=-Xms1g \ -# -Xmx1g \ +#sonar.search.javaOpts=-Xms512m \ +# -Xmx512m \ # -XX:+UseConcMarkSweepGC \ # -XX:CMSInitiatingOccupancyFraction=75 \ # -XX:+UseCMSInitiatingOccupancyOnly \ diff --git a/sonar-application/src/main/assembly/elasticsearch/config/jvm.options b/sonar-application/src/main/assembly/elasticsearch/config/jvm.options index 968a6a6a5cc..0ddb578ce1c 100644 --- a/sonar-application/src/main/assembly/elasticsearch/config/jvm.options +++ b/sonar-application/src/main/assembly/elasticsearch/config/jvm.options @@ -19,8 +19,8 @@ # Xms represents the initial size of total heap space # Xmx represents the maximum size of total heap space --Xms1g --Xmx1g +-Xms2g +-Xmx2g ################################################################ ## Expert settings |