diff options
| author | Harald Musum <musum@yahooinc.com> | 2022-08-12 09:34:24 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2022-08-12 09:34:24 +0200 |
| commit | 8894aaf15570b0b1b7cf5f181499d592024d3a57 (patch) | |
| tree | d6b84da1ef3665806050dc27dc725edcaa0c3fab | |
| parent | 625f7cb2fbb9360d1f4461c92c2037b9d840f40b (diff) | |
Flag value NOOP is not used, stop supporting it
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java | 19 | ||||
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java index f4d3d9657c2..8b0da901b38 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java @@ -44,6 +44,7 @@ import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.defaults.Defaults; import com.yahoo.vespa.flags.FlagSource; import com.yahoo.vespa.flags.Flags; +import com.yahoo.vespa.flags.UnboundStringFlag; import com.yahoo.yolean.Exceptions; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.ChildData; @@ -688,19 +689,13 @@ public class SessionRepository { try { app.validateFileExtensions(); } catch (IllegalArgumentException e) { - String flag = Flags.APPLICATION_FILES_WITH_UNKNOWN_EXTENSION.bindTo(flagSource) - .with(APPLICATION_ID, applicationId.serializedForm()) - .value(); if (configserverConfig.hostedVespa()) { - switch (flag) { - case "FAIL": - throw e; - case "LOG": - deployLogger.ifPresent(logger -> logger.logApplicationPackage(Level.WARNING, e.getMessage())); - break; - case "NOOP": - default: - break; + UnboundStringFlag flag = Flags.APPLICATION_FILES_WITH_UNKNOWN_EXTENSION; + String value = flag.bindTo(flagSource).with(APPLICATION_ID, applicationId.serializedForm()).value(); + switch (value) { + case "FAIL" -> throw e; + case "LOG" -> deployLogger.ifPresent(logger -> logger.logApplicationPackage(Level.WARNING, e.getMessage())); + default -> log.log(Level.WARNING, "Unknown value for flag " + flag.id() + ": " + value); } } else { deployLogger.ifPresent(logger -> logger.logApplicationPackage(Level.WARNING, e.getMessage())); 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 8e06cde420e..1b1a5493cc5 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -411,7 +411,7 @@ public class Flags { public static final UnboundStringFlag APPLICATION_FILES_WITH_UNKNOWN_EXTENSION = defineStringFlag( "fail-deployment-for-files-with-unknown-extension", "FAIL", List.of("hmusum"), "2022-04-27", "2022-09-01", - "Whether to log, fail or do nothing for deployments when app has a file with unknown extension (valid values LOG, FAIL, NOOP)", + "Whether to log, fail or do nothing for deployments when app has a file with unknown extension (valid values: LOG, FAIL)", "Takes effect at redeployment", ZONE_ID, APPLICATION_ID); |