diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-10-10 10:58:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-10 10:58:24 +0200 |
commit | b682654c786a94dc7dd564f4bc1047e1ed06500c (patch) | |
tree | 0f5bd04c9c8114aaee2956dcb34a2b6e5e2800be /configserver | |
parent | 607c054896d7034175ee2958ebabbfe79038c5a3 (diff) | |
parent | 56b79403a51344c1683b5baa1ed04f4a2d03209c (diff) |
Merge pull request #10937 from vespa-engine/bjorncs/cleanup
Remove unused feature flags
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java | 10 |
1 files changed, 0 insertions, 10 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 4cfc34797c9..5dd2c8fd58a 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 @@ -9,11 +9,7 @@ import com.yahoo.config.model.api.ServiceInfo; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; -import com.yahoo.vespa.flags.BooleanFlag; -import com.yahoo.vespa.flags.FetchVector; import com.yahoo.vespa.flags.FlagSource; -import com.yahoo.vespa.flags.Flags; -import com.yahoo.vespa.flags.IntFlag; import java.util.Collections; import java.util.Comparator; @@ -36,14 +32,10 @@ public class LbServicesProducer implements LbServicesConfig.Producer { private final Map<TenantName, Set<ApplicationInfo>> models; private final Zone zone; - private final BooleanFlag healthCheckOn4081; - private final IntFlag nginxUpstreamKeepaliveMultiplier; public LbServicesProducer(Map<TenantName, Set<ApplicationInfo>> models, Zone zone, FlagSource flagSource) { this.models = models; this.zone = zone; - this.healthCheckOn4081 = Flags.HEALTH_CHECK_ON_4081.bindTo(flagSource); - this.nginxUpstreamKeepaliveMultiplier = Flags.NGINX_UPSTREAM_KEEPALIVE_MULTIPLIER.bindTo(flagSource); } @Override @@ -70,8 +62,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.healthCheckOn4081(healthCheckOn4081.with(FetchVector.Dimension.APPLICATION_ID, app.getApplicationId().serializedForm()).value()); - ab.nginxUpstreamKeepaliveMultiplier(nginxUpstreamKeepaliveMultiplier.with(FetchVector.Dimension.APPLICATION_ID, app.getApplicationId().serializedForm()).value()); app.getModel().getHosts().stream() .sorted((a, b) -> a.getHostname().compareTo(b.getHostname())) .forEach(hostInfo -> ab.hosts(hostInfo.getHostname(), getHostsConfig(hostInfo))); |