diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-12-28 11:42:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-28 11:42:36 +0100 |
| commit | 7aebfa88991131648fcb2f3858849c09f198211e (patch) | |
| tree | 7b212d9078bd74cfbbfba3f3af1eebbe848b2df1 | |
| parent | 7733fa7a2adbd2926244503b7f6be1a21d1b1763 (diff) | |
| parent | 6f9e2af8284fcf41514ff705d3ad54223c14f999 (diff) | |
Merge pull request #20621 from vespa-engine/hmusum/dots-should-be-allowed-in-jvm-options
Allow dots in JVM options
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java | 1 |
2 files changed, 2 insertions, 1 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 d8be21e75e0..2da68262fe7 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 @@ -1070,7 +1070,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { private static class JvmOptions { - private static final Pattern validPattern = Pattern.compile("-[a-zA-z0-9=:]+"); + private static final Pattern validPattern = Pattern.compile("-[a-zA-z0-9=:.]+"); private final ContainerCluster<?> cluster; private final Element nodesElement; 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 0599bf5fd22..8b41ab145ec 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 @@ -246,6 +246,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase { // Valid options, should not log anything verifyLoggingOfJvmOptions(true, "options", "-Xms2G"); verifyLoggingOfJvmOptions(true, "options", "-verbose:gc"); + verifyLoggingOfJvmOptions(true, "options", "-Dvespa.freezedetector.disable=true"); verifyLoggingOfJvmOptions(false, "options", "-Xms2G"); } |