summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-10-02 15:59:00 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2019-10-02 15:59:00 +0200
commit2d9a6bf71dc136784775124334a29ad122e68105 (patch)
tree906c58db819ee3a61eb35093edf0f5a115850571 /configserver
parent08afce06f5d65fe3413d90f3bd9846e8b4ab6d16 (diff)
Add 'nginx-upstream-keepalive-multiplier' feature flag
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java4
1 files changed, 4 insertions, 0 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 f16be77715f..4cfc34797c9 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
@@ -13,6 +13,7 @@ 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,11 +37,13 @@ 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
@@ -68,6 +71,7 @@ public class LbServicesProducer implements LbServicesConfig.Producer {
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)));