Default, and only option, is now 'adaptive'

3 files changed, 4 insertions, 20 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index af3a8335475..2232e57a06f 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -42,7 +42,6 @@ public class TestProperties implements ModelContext.Properties {
     private double defaultTermwiseLimit = 1.0;
     private double threadPoolSizeFactor = 0.0;
     private double queueSizeFactor = 0.0;
-    private String docprocLoadBalancerType = null;
     private String jvmGCOptions = null;
     private Optional<EndpointCertificateSecrets> endpointCertificateSecrets = Optional.empty();
     private AthenzDomain athenzDomain;
@@ -64,7 +63,6 @@ public class TestProperties implements ModelContext.Properties {
     @Override public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; }
     @Override public Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return endpointCertificateSecrets; }
     @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
-    @Override public String docprocLoadBalancerType() { return docprocLoadBalancerType; }
     @Override public double threadPoolSizeFactor() {
         return threadPoolSizeFactor;
     }
@@ -76,10 +74,6 @@ public class TestProperties implements ModelContext.Properties {
     @Override public Optional<AthenzDomain> athenzDomain() { return Optional.ofNullable(athenzDomain); }
     @Override public Optional<ApplicationRoles> applicationRoles() { return Optional.ofNullable(applicationRoles); }
 
-    public TestProperties setDocprocLoadBalancerType(String type) {
-        docprocLoadBalancerType = type;
-        return this;
-    }
     public TestProperties setJvmGCOptions(String gcOptions) {
         jvmGCOptions = gcOptions;
         return this;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 82fbfe87de3..5127616ad5e 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -18,7 +18,6 @@ import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.container.core.ApplicationMetadataConfig;
 import com.yahoo.container.core.document.ContainerDocumentConfig;
-import com.yahoo.container.handler.ThreadPoolProvider;
 import com.yahoo.container.handler.ThreadpoolConfig;
 import com.yahoo.container.jdisc.JdiscBindingsConfig;
 import com.yahoo.container.jdisc.config.HealthMonitorConfig;
@@ -162,7 +161,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
 
     private final double threadPoolSizeFactor;
     private final double queueSizeFactor;
-    private final String docprocLoadbalancerType;
 
 
     public ContainerCluster(AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
@@ -172,7 +170,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         this.zone = (deployState != null) ? deployState.zone() : Zone.defaultZone();
         this.threadPoolSizeFactor = deployState.getProperties().threadPoolSizeFactor();
         this.queueSizeFactor = deployState.getProperties().queueSizeFactor();
-        this.docprocLoadbalancerType = deployState.getProperties().docprocLoadBalancerType();
 
         componentGroup = new ComponentGroup<>(this, "component");
 
@@ -202,10 +199,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         return queueSizeFactor;
     }
 
-    public String getDocprocLoadbalancerType() {
-        return docprocLoadbalancerType;
-    }
-
     public void setZone(Zone zone) {
         this.zone = zone;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java b/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java
index 3b9b8778e31..c2a85790f89 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java
@@ -150,23 +150,20 @@ public final class DocumentProtocol implements Protocol, Documentrouteselectorpo
                 String policy = policy(docproc);
 
                 for (DocprocChain chain : docproc.getChains().allChains().allComponents()) {
-                    addChainHop(table, cluster.getConfigId(), policy, chain, cluster.getDocprocLoadbalancerType());
+                    addChainHop(table, cluster.getConfigId(), policy, chain);
                 }
             }
         }
     }
 
-    private static void addChainHop(RoutingTableSpec table, String configId, String policy, DocprocChain chain, String docprocLoadBalancerType) {
+    private static void addChainHop(RoutingTableSpec table, String configId, String policy, DocprocChain chain) {
         final StringBuilder selector = new StringBuilder();
         if (policy != null) {
             selector.append(configId).append("/").append(policy).append("/").append(chain.getSessionName());
         } else {
             selector.append("[LoadBalancer:cluster=").append(configId)
-                    .append(";session=").append(chain.getSessionName());
-            if ((docprocLoadBalancerType != null) && ! docprocLoadBalancerType.isEmpty()) {
-                selector.append(";type=").append(docprocLoadBalancerType);
-            }
-            selector.append("]");
+                    .append(";session=").append(chain.getSessionName())
+                    .append("]");
         }
         table.addHop(new HopSpec(chain.getServiceName(), selector.toString()));
     }