Merge pull request #17233 from vespa-engine/mortent/remove-lb-pow2-flag

Remove flag controlling random routing lb

4 files changed, 2 insertions, 27 deletions

diff --git a/configdefinitions/src/vespa/lb-services.def b/configdefinitions/src/vespa/lb-services.def
index 46438cb6a40..521cadfb457 100644
--- a/configdefinitions/src/vespa/lb-services.def
+++ b/configdefinitions/src/vespa/lb-services.def
@@ -7,7 +7,7 @@ namespace=cloud.config
 # Active rotation given as flag 'active' for a prod region in deployment.xml
 # Default true for now (since code in config-model to set it is not ready yet), should have no default value
 tenants{}.applications{}.activeRotation                         bool default=true
-tenants{}.applications{}.usePowerOfTwoChoicesLb                 bool default=false
+tenants{}.applications{}.usePowerOfTwoChoicesLb                 bool default=true
 tenants{}.applications{}.generateNonMtlsEndpoint                bool default=true
 
 tenants{}.applications{}.hosts{}.hostname                       string default="(unknownhostname)"
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");
 
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 c64418ae0c1..ee22856e055 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -187,13 +187,6 @@ public class Flags {
             "Takes effect on next internal redeployment",
             APPLICATION_ID);
 
-    public static final UnboundBooleanFlag USE_POWER_OF_TWO_CHOICES_LOAD_BALANCING = defineFeatureFlag(
-            "use-power-of-two-choices-load-balancing", false,
-            List.of("tokle"), "2020-12-02", "2021-04-01",
-            "Whether to use Power of two load balancing algorithm for application",
-            "Takes effect on next internal redeployment",
-            APPLICATION_ID);
-
     public static final UnboundBooleanFlag GROUP_SUSPENSION = defineFeatureFlag(
             "group-suspension", true,
             List.of("hakon"), "2021-01-22", "2021-04-22",