diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-10-16 10:42:09 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2023-10-16 10:42:09 +0200 |
| commit | 0a4f867f461070e493c42d6f771589ce05b3972a (patch) | |
| tree | 8a70def67e78d78654c09f086be212c8b93f407d | |
| parent | 90c59bfc313263a238c464b21221d1ede8bf997a (diff) | |
Make 'warn' and 'fail' the only valid values for UNKNOWN_CONFIG_DEFINITION
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java | 1 | ||||
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java index e4eaa02acd5..47ae2f40414 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java @@ -69,7 +69,6 @@ public class UserConfiguredFiles implements Serializable { if (configDefinition == null) { String message = "Unable to find config definition " + key + ". Will not register files for file distribution for this config"; switch (unknownConfigDefinition) { - case "log" -> logger.logApplicationPackage(Level.INFO, message); case "warning" -> logger.logApplicationPackage(Level.WARNING, message); case "fail" -> throw new IllegalArgumentException("Unable to find config definition for " + key); } diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 56cd06d3b35..dc0930b42c1 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -411,8 +411,8 @@ public class Flags { public static final UnboundStringFlag UNKNOWN_CONFIG_DEFINITION = defineStringFlag( "unknown-config-definition", "warn", - List.of("hmusum"), "2023-09-25", "2023-11-01", - "How to handle user config referencing unknown config definitions. Valid values are log, warn, fail", + List.of("hmusum"), "2023-09-25", "2023-11-15", + "How to handle user config referencing unknown config definitions. Valid values are 'warn' and 'fail'", "Takes effect at redeployment", INSTANCE_ID); |