Keep the old default until tested in a full zone.

4 files changed, 4 insertions, 11 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/TuningDispatch.java b/config-model/src/main/java/com/yahoo/vespa/model/content/TuningDispatch.java
index 1ee70e1c1c5..b3815994742 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/TuningDispatch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/TuningDispatch.java
@@ -33,7 +33,7 @@ public class TuningDispatch {
     public static class Builder {
 
         private Integer maxHitsPerPartition;
-        private DispatchPolicy dispatchPolicy = DispatchPolicy.ADAPTIVE;
+        private DispatchPolicy dispatchPolicy = DispatchPolicy.ROUNDROBIN;
         private Boolean useLocalNode;
         private Double minGroupCoverage;
         private Double minActiveDocsCoverage;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
index ada1396cc62..8158de692a9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
@@ -32,7 +32,6 @@ public class Dispatch extends AbstractService implements SearchInterface,
     private final int dispatchLevel;
     private final boolean preferLocalRow;
     private final boolean isTopLevel;
-    private TuningDispatch.DispatchPolicy dispatchPolicy = TuningDispatch.DispatchPolicy.ROUNDROBIN;
 
     private Dispatch(DispatchGroup dispatchGroup, AbstractConfigProducer parent, String subConfigId,
                      NodeSpec nodeSpec, int dispatchLevel, boolean preferLocalRow, boolean isTopLevel) {
@@ -50,11 +49,6 @@ public class Dispatch extends AbstractService implements SearchInterface,
                 .setProp("index", nodeSpec.groupIndex());
     }
 
-    public Dispatch setDispatchPolicy(TuningDispatch.DispatchPolicy dispatchPolicy) {
-        this.dispatchPolicy = dispatchPolicy;
-        return this;
-    }
-
     public static Dispatch createTld(DispatchGroup dispatchGroup, AbstractConfigProducer parent, int rowId) {
         return createTld(dispatchGroup, parent, rowId, false);
     }
@@ -140,8 +134,7 @@ public class Dispatch extends AbstractService implements SearchInterface,
                 refcost(1).
                 rowbits(rowbits).
                 numparts(dispatchGroup.getNumPartitions()).
-                mpp(dispatchGroup.getMinNodesPerColumn()).
-                useroundrobinforfixedrow(dispatchPolicy == TuningDispatch.DispatchPolicy.ROUNDROBIN);
+                mpp(dispatchGroup.getMinNodesPerColumn());
         if (dispatchGroup.useFixedRowInDispatch()) {
             datasetBuilder.querydistribution(PartitionsConfig.Dataset.Querydistribution.Enum.FIXEDROW);
             datasetBuilder.maxnodesdownperfixedrow(dispatchGroup.getMaxNodesDownPerFixedRow());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/TuningDispatchTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/TuningDispatchTest.java
index 5dab009509d..e84f256d6dc 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/TuningDispatchTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/TuningDispatchTest.java
@@ -49,6 +49,6 @@ public class TuningDispatchTest {
     public void requireThatDefaultsAreNull() {
         TuningDispatch dispatch = new TuningDispatch.Builder().build();
         assertNull(dispatch.getMaxHitsPerPartition());
-        assertTrue(TuningDispatch.DispatchPolicy.ADAPTIVE == dispatch.getDispatchPolicy());
+        assertTrue(TuningDispatch.DispatchPolicy.ROUNDROBIN == dispatch.getDispatchPolicy());
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilderTest.java
index 93e48f556eb..d9646c163e4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilderTest.java
@@ -45,7 +45,7 @@ public class DomTuningDispatchBuilderTest {
         assertNull(dispatch.getMaxHitsPerPartition());
         assertNull(dispatch.getMinGroupCoverage());
         assertNull(dispatch.getMinActiveDocsCoverage());
-        assertTrue(TuningDispatch.DispatchPolicy.ADAPTIVE == dispatch.getDispatchPolicy());
+        assertTrue(TuningDispatch.DispatchPolicy.ROUNDROBIN == dispatch.getDispatchPolicy());
     }
 
     @Test