diff options
| author | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-07-29 17:47:03 +0200 |
|---|---|---|
| committer | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-07-29 17:47:03 +0200 |
| commit | 41e12aea73c6a4917d8d877c36f3421e03064e46 (patch) | |
| tree | e224dc73332e952be0b1ef34b3974006544ed942 | |
| parent | 20688b88774a2809c5a88d786cf38fae49de0388 (diff) | |
| download | sonarqube-41e12aea73c6a4917d8d877c36f3421e03064e46.tar.gz sonarqube-41e12aea73c6a4917d8d877c36f3421e03064e46.zip | |
SONAR-5237 - ES java_opts defaults
| -rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 2 | ||||
| -rw-r--r-- | sonar-application/src/main/java/org/sonar/application/DefaultSettings.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 9e2dd261d30..ce2bb92b4cd 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -8,7 +8,7 @@ #-------------------------------------------------------------------------------------------------- # TO BE DOCUMENTED - WORK IN PROGRESS -sonar.search.javaOpts=-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m -Xms256m -Xss256k -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly +#sonar.search.javaOpts=-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m -Xms256m -Xss256k -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly #sonar.search.port=9001 #sonar.search.jmxPort=9002 diff --git a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java index 99ebcd6c43a..b4f4485d8c6 100644 --- a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java +++ b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java @@ -40,9 +40,9 @@ class DefaultSettings { private static final int ES_JMX_PORT_DEFVAL = 9002; static final String ES_JAVA_OPTS_KEY = "sonar.search.javaOpts"; - private static final String ES_JAVA_OPTS_DEFVAL = "-server -Xmx256m -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true " + + private static final String ES_JAVA_OPTS_DEFVAL = "-Xmx256m -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true " + "-XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly " + - "-XX:+HeapDumpOnOutOfMemoryError"; + "-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true"; static final String WEB_JMX_PORT_KEY = "sonar.web.jmxPort"; |