SONAR-8798 Update memory for Elasticsearch to 512m by default

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 c2f61f644e9254b304bf3b25823a147db22e9138..63a8bc8fb17412adb261aae3c0ce6f6f83a70412 100644 (file)
--- 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 65a74e228ffb13d5adad6746acae4106440b37e2..2e386d9e5c5a55fabaad573ba2c3ec3e57ed6664 100644 (file)
--- 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 968a6a6a5cc4cb74d5106e483ab2452d95d91865..0ddb578ce1cc0155ccc450b71a56e43b27cded67 100644 (file)
--- 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