diff options
Diffstat (limited to 'config-model')
3 files changed, 4 insertions, 28 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/DispatchTuningTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/DispatchTuningTest.java index af547965749..15fba6a7dc9 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/DispatchTuningTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/DispatchTuningTest.java @@ -15,13 +15,13 @@ public class DispatchTuningTest { void requireThatAccessorWork() { DispatchTuning dispatch = new DispatchTuning.Builder() .setMaxHitsPerPartition(69) - .setDispatchPolicy("round-robin") + .setDispatchPolicy("best-of-random-2") .setMinActiveDocsCoverage(12.5) .setTopKProbability(18.3) .build(); assertEquals(69, dispatch.getMaxHitsPerPartition().intValue()); assertEquals(12.5, dispatch.getMinActiveDocsCoverage(), 0.0); - assertEquals(DispatchTuning.DispatchPolicy.ROUNDROBIN, dispatch.getDispatchPolicy()); + assertEquals(DispatchTuning.DispatchPolicy.BEST_OF_RANDOM_2, dispatch.getDispatchPolicy()); assertEquals(18.3, dispatch.getTopkProbability(), 0.0); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java index 8a47eb030f3..ab147f22e8b 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java @@ -144,30 +144,6 @@ public class IndexedHierarchicDistributionTest { "</tuning>"); } - private String getRandomDispatchXml() { - return joinLines("<tuning>", - " <dispatch>", - " <dispatch-policy>random</dispatch-policy>", - " </dispatch>", - "</tuning>"); - } - - private ContentCluster getOddGroupsCluster() throws Exception { - String groupXml = joinLines(" <group>", - " <distribution partitions='2|*'/>", - " <group distribution-key='0' name='group0'>", - " <node distribution-key='0' hostalias='mockhost'/>", - " <node distribution-key='1' hostalias='mockhost'/>", - " </group>", - " <group distribution-key='1' name='group1'>", - " <node distribution-key='3' hostalias='mockhost'/>", - " <node distribution-key='4' hostalias='mockhost'/>", - " <node distribution-key='5' hostalias='mockhost'/>", - " </group>", - " </group>", ""); - return createCluster(createClusterXml(groupXml, Optional.of(getRandomDispatchXml()), 4, 4)); - } - @Test void requireThatWeMustHaveOnlyOneGroupLevel() { try { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java index a6ea6cb8132..0800f26d6e8 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java @@ -72,7 +72,7 @@ public class ClusterTest { "", joinLines( "<max-hits-per-partition>77</max-hits-per-partition>", - "<dispatch-policy>round-robin</dispatch-policy>", + "<dispatch-policy>best-of-random-2</dispatch-policy>", "<min-active-docs-coverage>93</min-active-docs-coverage>", "<top-k-probability>0.777</top-k-probability>"), false); @@ -81,7 +81,7 @@ public class ClusterTest { DispatchConfig config = new DispatchConfig(builder); assertEquals(3, config.redundancy()); assertEquals(93.0, config.minActivedocsPercentage(), DELTA); - assertEquals(DispatchConfig.DistributionPolicy.ROUNDROBIN, config.distributionPolicy()); + assertEquals(DispatchConfig.DistributionPolicy.BEST_OF_RANDOM_2, config.distributionPolicy()); assertEquals(77, config.maxHitsPerNode()); assertEquals(0.777, config.topKProbability(), DELTA); } |