summaryrefslogtreecommitdiffstats
path: root/container-search/src
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2016-08-22 12:36:33 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2016-08-22 12:36:33 +0200
commitf59b6ab40d74f0d25d98c13910d41429fee3698a (patch)
tree6b99c92ab4e2808777a3ac2ba453bd1a0857fdb0 /container-search/src
parent194f04da54a9b5f2165213a2e1407c2db2a0d7af (diff)
Rename new config value and correct assert message
Diffstat (limited to 'container-search/src')
-rw-r--r--container-search/src/main/java/com/yahoo/search/dispatch/SearchCluster.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DirectSearchTestCase.java4
2 files changed, 2 insertions, 4 deletions
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));
}
}