diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2019-03-12 11:25:16 +0100 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2019-03-18 20:20:59 +0100 |
| commit | 799da14f1ed182d5535772be78a690474e71c1fc (patch) | |
| tree | 005546a8919801544d988717b2119cf287313815 /server | |
| parent | d8f18ca2eb2b3d8bf0e45354087dff27a998b677 (diff) | |
| download | sonarqube-799da14f1ed182d5535772be78a690474e71c1fc.tar.gz sonarqube-799da14f1ed182d5535772be78a690474e71c1fc.zip | |
SONAR-11804 do not send -server flag to ES JVM anymore
Diffstat (limited to 'server')
3 files changed, 3 insertions, 6 deletions
diff --git a/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java b/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java index 7a30a8d938d..f71240d4fba 100644 --- a/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java +++ b/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java @@ -44,7 +44,6 @@ public class EsJvmOptions extends JvmOptions<EsJvmOptions> { res.put("-XX:CMSInitiatingOccupancyFraction=", "75"); res.put("-XX:+UseCMSInitiatingOccupancyOnly", ""); res.put("-XX:+AlwaysPreTouch", ""); - res.put("-server", ""); res.put("-Xss", "1m"); res.put("-Djava.awt.headless=", "true"); res.put("-Dfile.encoding=", "UTF-8"); diff --git a/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java index d2e9328f8d0..eae7e231be6 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java @@ -136,7 +136,7 @@ public class CommandFactoryImplTest { assertThat(esConfig.getPort()).isEqualTo(9001); assertThat(esConfig.getEsJvmOptions().getAll()) // enforced values - .contains("-XX:+UseConcMarkSweepGC", "-server", "-Dfile.encoding=UTF-8") + .contains("-XX:+UseConcMarkSweepGC", "-Dfile.encoding=UTF-8") // default settings .contains("-Xms512m", "-Xmx512m", "-XX:+HeapDumpOnOutOfMemoryError"); File esConfDir = new File(tempDir, "conf/es"); @@ -169,7 +169,7 @@ public class CommandFactoryImplTest { assertThat(esConfig.getPort()).isEqualTo(9001); assertThat(esConfig.getEsJvmOptions().getAll()) // enforced values - .contains("-XX:+UseConcMarkSweepGC", "-server", "-Dfile.encoding=UTF-8") + .contains("-XX:+UseConcMarkSweepGC", "-Dfile.encoding=UTF-8") // default settings .contains("-Xms512m", "-Xmx512m", "-XX:+HeapDumpOnOutOfMemoryError"); File esConfDir = new File(tempDir, "conf/es"); @@ -201,7 +201,7 @@ public class CommandFactoryImplTest { assertThat(esConfig.getPort()).isEqualTo(1234); assertThat(esConfig.getEsJvmOptions().getAll()) // enforced values - .contains("-XX:+UseConcMarkSweepGC", "-server", "-Dfile.encoding=UTF-8") + .contains("-XX:+UseConcMarkSweepGC", "-Dfile.encoding=UTF-8") // user settings .contains("-Xms10G", "-Xmx10G") // default values disabled diff --git a/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java b/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java index 67fae791382..3d057470e80 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java @@ -44,7 +44,6 @@ public class EsJvmOptionsTest { "-XX:CMSInitiatingOccupancyFraction=75", "-XX:+UseCMSInitiatingOccupancyOnly", "-XX:+AlwaysPreTouch", - "-server", "-Xss1m", "-Djava.awt.headless=true", "-Dfile.encoding=UTF-8", @@ -77,7 +76,6 @@ public class EsJvmOptionsTest { "-XX:CMSInitiatingOccupancyFraction=75\n" + "-XX:+UseCMSInitiatingOccupancyOnly\n" + "-XX:+AlwaysPreTouch\n" + - "-server\n" + "-Xss1m\n" + "-Djava.awt.headless=true\n" + "-Dfile.encoding=UTF-8\n" + |