aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/vespa/model
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2022-01-10 10:08:04 +0100
committerHarald Musum <musum@yahooinc.com>2022-01-10 10:08:04 +0100
commitf7a1319189fec755a5249807e28dcd3244b923b2 (patch)
treef50e813044e36f00bc1acfd99e57361e0a910ed2 /config-model/src/main/java/com/yahoo/vespa/model
parent597792f3760034f2055b83c9518a9c328f39cb42 (diff)
Update javadoc
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java11
1 files changed, 8 insertions, 3 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 288476de015..e961b39ff8e 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
@@ -1061,7 +1061,11 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
return CONTAINER_TAG.equals(element.getTagName()) || DEPRECATED_CONTAINER_TAG.equals(element.getTagName());
}
- private static class JvmOptions {
+ /**
+ * Validates JVM options and logs a warning or fails deployment (depending on feature flag)
+ * if anyone of them has invalid syntax or is an option that is unsupported for the running system.
+ */
+ private static class JvmOptions {
private static final Pattern validPattern = Pattern.compile("-[a-zA-z0-9=:./,]+");
// debug port will not be available in hosted, don't allow
@@ -1157,8 +1161,9 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
}
/**
- * Validates JVM GC options and logs a warning if anyone of them has invalid syntax or is an option
- * that is unsupported for the running system (e.g. uses CMS options for hosted Vespa, which uses JDK 17)
+ * Validates JVM GC options and logs a warning or fails deployment (depending on feature flag)
+ * if anyone of them has invalid syntax or is an option that is unsupported for the running system
+ * (e.g. uses CMS options for hosted Vespa, which uses JDK 17).
*/
private static class JvmGcOptions {