diff options
| author | Harald Musum <musum@verizonmedia.com> | 2022-01-12 00:35:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-12 00:35:25 +0100 |
| commit | ebc5f58ceed40d4eb2328a4be425b88a25bb2e41 (patch) | |
| tree | 75b024d28dd75e770293709bf2cc25df0287cf59 /config-model | |
| parent | df46e4d82f1e1eafbd1fdc5c44485dc978b3fe50 (diff) | |
| parent | 8de7e46a0b4aa51edc49ac2d906c1100378505a2 (diff) | |
Merge pull request #20765 from vespa-engine/hmusum/allow-more-characters-in-jvmp-options
Allow more characters in JVM options
Diffstat (limited to 'config-model')
| -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 e961b39ff8e..986d5a21c70 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 @@ -1067,7 +1067,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=:./,+-]+"); // debug port will not be available in hosted, don't allow private static final Pattern invalidInHostedatttern = Pattern.compile("-Xrunjdwp:transport=.*"); 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 ba27deedb61..a17459ea800 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 @@ -254,6 +254,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase { verifyLoggingOfJvmOptions(true, "options", "-Xms2G"); verifyLoggingOfJvmOptions(true, "options", "-verbose:gc"); verifyLoggingOfJvmOptions(true, "options", "-Djava.library.path=/opt/vespa/lib64:/home/y/lib64"); + verifyLoggingOfJvmOptions(true, "options", "-XX:-OmitStackTraceInFastThrow"); verifyLoggingOfJvmOptions(false, "options", "-Xms2G"); } |