Remove 'dynamic-upstream-connection-cache' flag

4 files changed, 0 insertions, 27 deletions

diff --git a/configdefinitions/src/vespa/lb-services.def b/configdefinitions/src/vespa/lb-services.def
index 2daa371db8f..5184abfde72 100644
--- a/configdefinitions/src/vespa/lb-services.def
+++ b/configdefinitions/src/vespa/lb-services.def
@@ -7,8 +7,6 @@ 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
-# Scale upstream connection cache with number of upstream servers
-tenants{}.applications{}.dynamicUpstreamConnectionCache         bool default=false
 # Send health check requests on port 4081 instead of 4080
 tenants{}.applications{}.healthCheckOn4081                      bool default=false
 
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 3610de172a2..f16be77715f 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 dynamicUpstreamConnectionCache;
     private final BooleanFlag healthCheckOn4081;
 
     public LbServicesProducer(Map<TenantName, Set<ApplicationInfo>> models, Zone zone, FlagSource flagSource) {
         this.models = models;
         this.zone = zone;
-        this.dynamicUpstreamConnectionCache = Flags.DYNAMIC_UPSTREAM_CONNECTION_CACHE.bindTo(flagSource);
         this.healthCheckOn4081 = Flags.HEALTH_CHECK_ON_4081.bindTo(flagSource);
     }
 
@@ -69,7 +67,6 @@ 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.dynamicUpstreamConnectionCache(dynamicUpstreamConnectionCache.with(FetchVector.Dimension.APPLICATION_ID, app.getApplicationId().serializedForm()).value());
         ab.healthCheckOn4081(healthCheckOn4081.with(FetchVector.Dimension.APPLICATION_ID, app.getApplicationId().serializedForm()).value());
         app.getModel().getHosts().stream()
                 .sorted((a, b) -> a.getHostname().compareTo(b.getHostname()))
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 d490f24bed4..bc777659298 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
@@ -17,7 +17,6 @@ import com.yahoo.config.provision.Rotation;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.config.ConfigPayload;
-import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.model.VespaModel;
 import org.junit.Test;
@@ -111,22 +110,6 @@ public class LbServicesProducerTest {
         }
     }
 
-    @Test
-    public void dynamic_upstream_connections_is_configured_from_feature_flag() throws IOException, SAXException {
-        {
-            flagSource.withBooleanFlag(Flags.DYNAMIC_UPSTREAM_CONNECTION_CACHE.id(), true);
-            RegionName regionName = RegionName.from("us-east-1");
-            LbServicesConfig conf = createModelAndGetLbServicesConfig(regionName);
-            assertTrue(conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").dynamicUpstreamConnectionCache());
-        }
-        {
-            flagSource.withBooleanFlag(Flags.DYNAMIC_UPSTREAM_CONNECTION_CACHE.id(), false);
-            RegionName regionName = RegionName.from("us-east-2");
-            LbServicesConfig conf = createModelAndGetLbServicesConfig(regionName);
-            assertFalse(conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").dynamicUpstreamConnectionCache());
-        }
-    }
-
     private LbServicesConfig createModelAndGetLbServicesConfig(RegionName regionName) throws IOException, SAXException {
         Zone zone = new Zone(Environment.prod, regionName);
         Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder()
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 54531aeb0d7..04514f7ba81 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -165,11 +165,6 @@ public class Flags {
             "Takes effect on next tick or on host-admin restart.",
             APPLICATION_ID);
 
-    public static final UnboundBooleanFlag DYNAMIC_UPSTREAM_CONNECTION_CACHE = defineFeatureFlag(
-            "dynamic-upstream-connection-cache", false,
-            "Scale upstream connection cache with number of upstream servers",
-            "Takes effect on routing container redeployment");
-
     public static final UnboundBooleanFlag HEALTH_CHECK_ON_4081 = defineFeatureFlag(
             "health-check-on-4081", false,
             "Change nginx to send health check requests on port 4081 instead of 4080.",