diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-05-26 09:25:49 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2020-05-26 09:25:49 +0200 |
| commit | 09384270817caeb6e6e1a3b5bd6fe3f7d1e42643 (patch) | |
| tree | edd7013ea23238c1b841958c6bfca845faad43c1 | |
| parent | e5d6fb2b0c1762f49d123230a43880383def7c7f (diff) | |
Let configserver-unset-endpoints default to true
| -rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java | 13 | ||||
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java index 050320787db..d0e6c2cb3c5 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java @@ -241,16 +241,19 @@ public class SessionPreparerTest { prepare(new File("src/test/resources/deploy/hosted-app"), params); assertEquals(expected, readContainerEndpoints(applicationId)); - // Preparing with empty container endpoints keeps old value + // Preparing with empty container endpoints clears endpoints params = new PrepareParams.Builder().applicationId(applicationId).containerEndpoints("[]").build(); prepare(new File("src/test/resources/deploy/hosted-app"), params); - assertEquals(expected, readContainerEndpoints(applicationId)); + assertEquals(List.of(), readContainerEndpoints(applicationId)); - // Preparing with empty container endpoints clears endpoints with feature flag set - flagSource.withBooleanFlag(Flags.CONFIGSERVER_UNSET_ENDPOINTS.id(), true); + // Preparing with empty container endpoints keeps old value with feature flag turned off + params = new PrepareParams.Builder().applicationId(applicationId).containerEndpoints(endpoints).build(); + prepare(new File("src/test/resources/deploy/hosted-app"), params); + assertEquals(expected, readContainerEndpoints(applicationId)); + flagSource.withBooleanFlag(Flags.CONFIGSERVER_UNSET_ENDPOINTS.id(), false); params = new PrepareParams.Builder().applicationId(applicationId).containerEndpoints("[]").build(); prepare(new File("src/test/resources/deploy/hosted-app"), params); - assertEquals(List.of(), readContainerEndpoints(applicationId)); + assertEquals(expected, readContainerEndpoints(applicationId)); } @Test 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 c328b5ae151..8f2557a6560 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -276,7 +276,7 @@ public class Flags { ZONE_ID); public static final UnboundBooleanFlag CONFIGSERVER_UNSET_ENDPOINTS = defineFeatureFlag( - "configserver-unset-endpoints", false, + "configserver-unset-endpoints", true, "Whether the configserver allows removal of existing endpoints when an empty list of container endpoints is request", "Takes effect on next external deployment", APPLICATION_ID |