diff options
4 files changed, 4 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java index 2755ead9c3e..a8f6cbd2235 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java @@ -384,7 +384,7 @@ public abstract class IndexedSearchCluster extends SearchCluster nodeBuilder.port(node.getRpcPort()); nodeBuilder.fs4port(node.getDispatchPort()); if (tuning.dispatch.minActiveDocsCoverage != null) - builder.min_activedocs_coverage(tuning.dispatch.minActiveDocsCoverage); + builder.minActivedocsPercentage(tuning.dispatch.minActiveDocsCoverage); builder.node(nodeBuilder); } } diff --git a/configdefinitions/src/vespa/dispatch.def b/configdefinitions/src/vespa/dispatch.def index 29a046a9ee0..16a0cb85014 100644 --- a/configdefinitions/src/vespa/dispatch.def +++ b/configdefinitions/src/vespa/dispatch.def @@ -5,7 +5,7 @@ namespace=vespa.config.search # The active docs a group must have as a % of the average active docs of all other groups, # for that group to be included in queries -min_activedocs_coverage double default=97.0 +minActivedocsPercentage double default=97.0 # The unique key of a search node node[].key int diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/SearchCluster.java b/container-search/src/main/java/com/yahoo/search/dispatch/SearchCluster.java index 05c27c6ca86..bd47c0525ab 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/SearchCluster.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/SearchCluster.java @@ -52,7 +52,7 @@ public class SearchCluster implements NodeManager<SearchCluster.Node> { private final FS4ResourcePool fs4ResourcePool; public SearchCluster(DispatchConfig dispatchConfig, FS4ResourcePool fs4ResourcePool) { - this(dispatchConfig.min_activedocs_coverage(), toNodes(dispatchConfig), fs4ResourcePool); + this(dispatchConfig.minActivedocsPercentage(), toNodes(dispatchConfig), fs4ResourcePool); } public SearchCluster(double minActivedocsCoverage, List<Node> nodes, FS4ResourcePool fs4ResourcePool) { diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DirectSearchTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DirectSearchTestCase.java index 740639650e2..7e935b90386 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DirectSearchTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DirectSearchTestCase.java @@ -109,9 +109,7 @@ public class DirectSearchTestCase { tester.setActiveDocuments(FastSearcherTester.selfHostname, 100); assertEquals("1 ping request, 0 search requests", 1, tester.requestCount(FastSearcherTester.selfHostname, 9999)); tester.search("?query=test&dispatch.direct=true&nocache"); - assertEquals("1 ping request, 0 search requests", - 2, tester.requestCount(FastSearcherTester.selfHostname, 9999)); - + assertEquals("1 ping request, 1 search requests", 2, tester.requestCount(FastSearcherTester.selfHostname, 9999)); } } |