diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-10-16 15:27:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-16 15:27:54 +0200 |
| commit | 2c243871f2ddf031abe4ba1ebd2e84b78be8658c (patch) | |
| tree | 260db8cefe0bb997cbf4ace152b4a88e0809930b | |
| parent | eda5cf16272e7aa8d15bba47a45914df2ff00884 (diff) | |
| parent | 0a4f867f461070e493c42d6f771589ce05b3972a (diff) | |
Merge pull request #28939 from vespa-engine/hmusum/use-only-warn-and-fail-for-flag
Make 'warn' and 'fail' the only valid values for UNKNOWN_CONFIG_DEFIN…
| -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 d7073ebc0eb..5baefefb72b 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); |