summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-06-02 16:47:07 +0200
committerGitHub <noreply@github.com>2020-06-02 16:47:07 +0200
commit9a9574c658a607745f001b6368b05ddc22433c6c (patch)
tree1f11eec12ba40df3f1a35f3a1ad136a7731e12b8 /configserver
parentfdc4350398029fbffbed3c0498380589a73571d7 (diff)
parent6daca073b0134833d0fc0a1c6b4f662c658a52d8 (diff)
Merge pull request #13448 from vespa-engine/balder/random-best-of-2-lb
Make the current loadbalancer into 'legacy'.
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index 288df341f2a..c925157b980 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -153,6 +153,7 @@ public class ModelContextImpl implements ModelContext {
private final double defaultTermwiseLimit;
private final double threadPoolSizeFactor;
private final double queueSizefactor;
+ private final String docprocLoadBalancerType;
private final Optional<AthenzDomain> athenzDomain;
private final Optional<ApplicationRoles> applicationRoles;
private final int jdiscHealthCheckProxyClientTimeout;
@@ -194,6 +195,8 @@ public class ModelContextImpl implements ModelContext {
.with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
queueSizefactor = Flags.DEFAULT_QUEUE_SIZE_FACTOR.bindTo(flagSource)
.with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
+ docprocLoadBalancerType = Flags.DOCPROC_LOADBALANCER_TYPE.bindTo(flagSource)
+ .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
this.athenzDomain = athenzDomain;
this.applicationRoles = applicationRoles;
jdiscHealthCheckProxyClientTimeout = Flags.JDISC_HEALTH_CHECK_PROXY_CLIENT_TIMEOUT.bindTo(flagSource)
@@ -254,6 +257,11 @@ public class ModelContextImpl implements ModelContext {
}
@Override
+ public String docprocLoadBalancerType() {
+ return docprocLoadBalancerType;
+ }
+
+ @Override
public boolean useDistributorBtreeDb() {
return useDistributorBtreeDb;
}