diff options
| author | Harald Musum <musum@yahooinc.com> | 2021-11-22 12:45:42 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2021-11-22 14:28:33 +0100 |
| commit | c9f60fb394ff5514cac26217a1f09845793f8677 (patch) | |
| tree | 14f97e673ad342b301d0f98708794126ab0ed410 /config-model | |
| parent | 8b71018b99590b84802ace31244ace41483716b4 (diff) | |
Minor non-functional changes
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 35282c186cb..319f334ffc2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -660,12 +660,12 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { static boolean incompatibleGCOptions(String jvmargs) { Pattern gcAlgorithm = Pattern.compile("-XX:[-+]Use.+GC"); Pattern cmsArgs = Pattern.compile("-XX:[-+]*CMS"); - return (gcAlgorithm.matcher(jvmargs).find() ||cmsArgs.matcher(jvmargs).find()); + return (gcAlgorithm.matcher(jvmargs).find() || cmsArgs.matcher(jvmargs).find()); } - private static String buildJvmGCOptions(DeployState deployState, String jvmGCOPtions) { - String options = (jvmGCOPtions != null) - ? jvmGCOPtions + private static String buildJvmGCOptions(DeployState deployState, String jvmGCOptions) { + String options = (jvmGCOptions != null) + ? jvmGCOptions : deployState.getProperties().jvmGCOptions(); return (options == null || options.isEmpty()) ? (deployState.isHosted() ? ContainerCluster.PARALLEL_GC : ContainerCluster.G1GC) @@ -684,7 +684,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } else { jvmOptions = nodesElement.getAttribute(VespaDomBuilder.JVMARGS_ATTRIB_NAME); if (incompatibleGCOptions(jvmOptions)) { - deployLogger.logApplicationPackage(WARNING, "You need to move out your GC related options from 'jvmargs' to 'jvm-gc-options'"); + deployLogger.logApplicationPackage(WARNING, "You need to move out your GC-related options from deprecated 'jvmargs' to 'jvm-gc-options'"); cluster.setJvmGCOptions(ContainerCluster.G1GC); } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java index 43677b4e2ef..9fda6016969 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java @@ -137,7 +137,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase { verifyJvmGCOptions(true, "", null, ContainerCluster.PARALLEL_GC); verifyJvmGCOptions(false, "-XX:+UseG1GC", null, "-XX:+UseG1GC"); verifyJvmGCOptions(true, "-XX:+UseG1GC", null, "-XX:+UseG1GC"); - verifyJvmGCOptions(false, null,"-XX:+UseG1GC", "-XX:+UseG1GC"); + verifyJvmGCOptions(false, null, "-XX:+UseG1GC", "-XX:+UseG1GC"); verifyJvmGCOptions(false, "-XX:+UseParallelGC", "-XX:+UseG1GC", "-XX:+UseG1GC"); verifyJvmGCOptions(false, null, "-XX:+UseParallelGC", "-XX:+UseParallelGC"); } |