diff options
author | Morten Tokle <mortent@verizonmedia.com> | 2021-03-30 10:57:25 +0200 |
---|---|---|
committer | Morten Tokle <mortent@verizonmedia.com> | 2021-03-30 11:01:35 +0200 |
commit | 6628649929dc398cc4138f9b59e60dd97ccccda6 (patch) | |
tree | 52d3f574b86a1cba2f54f04551e875da154307b3 /configserver | |
parent | 3169f66bf208aa984605fa319046aabccc61c421 (diff) |
Remove flag controlling random routing lb
Diffstat (limited to 'configserver')
2 files changed, 1 insertions, 19 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java index c195f1a9f96..b2e239c7ebc 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java @@ -35,13 +35,11 @@ public class LbServicesProducer implements LbServicesConfig.Producer { private final Map<TenantName, Set<ApplicationInfo>> models; private final Zone zone; - private final BooleanFlag usePowerOfTwoChoicesLb; private final BooleanFlag generateNonMtlsEndpoint; public LbServicesProducer(Map<TenantName, Set<ApplicationInfo>> models, Zone zone, FlagSource flagSource) { this.models = models; this.zone = zone; - usePowerOfTwoChoicesLb = Flags.USE_POWER_OF_TWO_CHOICES_LOAD_BALANCING.bindTo(flagSource); generateNonMtlsEndpoint = Flags.GENERATE_NON_MTLS_ENDPOINT.bindTo(flagSource); } @@ -74,7 +72,7 @@ public class LbServicesProducer implements LbServicesConfig.Producer { private LbServicesConfig.Tenants.Applications.Builder getAppConfig(ApplicationInfo app) { LbServicesConfig.Tenants.Applications.Builder ab = new LbServicesConfig.Tenants.Applications.Builder(); ab.activeRotation(getActiveRotation(app)); - ab.usePowerOfTwoChoicesLb(usePowerOfTwoChoicesLb(app)); + ab.usePowerOfTwoChoicesLb(true); ab.generateNonMtlsEndpoint(generateNonMtlsEndpoint(app)); app.getModel().getHosts().stream() .sorted((a, b) -> a.getHostname().compareTo(b.getHostname())) @@ -96,10 +94,6 @@ public class LbServicesProducer implements LbServicesConfig.Producer { return activeRotation; } - private boolean usePowerOfTwoChoicesLb(ApplicationInfo app) { - return usePowerOfTwoChoicesLb.with(FetchVector.Dimension.APPLICATION_ID, app.getApplicationId().serializedForm()).value(); - } - private boolean generateNonMtlsEndpoint(ApplicationInfo app) { return generateNonMtlsEndpoint.with(FetchVector.Dimension.APPLICATION_ID, app.getApplicationId().serializedForm()).value(); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java index 31746b66806..e94a99f59d7 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java @@ -113,18 +113,6 @@ public class LbServicesProducerTest { } @Test - public void use_power_of_two_lb_is_configured_from_feature_flag() { - RegionName regionName = RegionName.from("us-east-1"); - - LbServicesConfig conf = createModelAndGetLbServicesConfig(regionName); - assertFalse(conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").usePowerOfTwoChoicesLb()); - - flagSource.withBooleanFlag(Flags.USE_POWER_OF_TWO_CHOICES_LOAD_BALANCING.id(), true); - conf = createModelAndGetLbServicesConfig(regionName); - assertTrue(conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").usePowerOfTwoChoicesLb()); - } - - @Test public void generate_non_mtls_endpoints_from_feature_flag() { RegionName regionName = RegionName.from("us-east-1"); |