diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-04-11 13:50:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-11 13:50:26 +0200 |
commit | edd602076f3e9ce8d904811c309b4512a7f94741 (patch) | |
tree | 419b743252cd8b24ef93fb146024821cf42f5ddc /container-search | |
parent | f9ce8b229aed278a94c5425272a42ace6884bb73 (diff) |
Revert "Revert "Direct dispatch by default when group size is 1""
Diffstat (limited to 'container-search')
5 files changed, 6 insertions, 14 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java index 4b71b3a45a4..8d4e9418c1c 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; * Provider for {@link com.yahoo.fs4.mplex.ListenerPool}. All users will get the same pool instance. * * @author baldersheim - * @since 5.4.0 */ public class FS4ResourcePool extends AbstractComponent { diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java index 7b5ded6a9d6..7d822fd603b 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java @@ -66,8 +66,6 @@ public class FastSearcher extends VespaBackEndSearcher { private final FS4ResourcePool fs4ResourcePool; - private final String selfHostname; - /** * Creates a Fastsearcher. * @@ -91,7 +89,6 @@ public class FastSearcher extends VespaBackEndSearcher { this.dispatchBackend = dispatchBackend; this.fs4ResourcePool = fs4ResourcePool; this.dispatcher = dispatcher; - this.selfHostname = HostName.getLocalhost(); } private int countFastHits(Result result) { @@ -221,16 +218,12 @@ public class FastSearcher extends VespaBackEndSearcher { * for efficiency. */ private Backend chooseBackend(Query query) { - // TODO 2016-08-16: Turn this on by default (by changing the 'false' below to 'true') - if ( ! query.properties().getBoolean(dispatchDirect, false)) return dispatchBackend; - - // Don't use direct dispatch if the upstream ClusterSearcher did not chose the local dispatch - // as that probably means that we are in a failover situation - if ( ! dispatchBackend.getHost().equals(selfHostname)) return dispatchBackend; + if ( ! query.properties().getBoolean(dispatchDirect, true)) return dispatchBackend; Optional<SearchCluster.Node> directDispatchRecipient = dispatcher.searchCluster().directDispatchTarget(); if ( ! directDispatchRecipient.isPresent()) return dispatchBackend; + // Dispatch directly to the single, local search node query.trace(false, 2, "Dispatching directly to ", directDispatchRecipient.get()); return fs4ResourcePool.getBackend(directDispatchRecipient.get().hostname(), directDispatchRecipient.get().fs4port()); 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 89d3bc7d3b0..ca3a25d3bfa 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 @@ -29,10 +29,10 @@ public class DirectSearchTestCase { } @Test - public void testDirectSearchDisabledByDefault() { + public void testDirectSearchEnabledByDefault() { FastSearcherTester tester = new FastSearcherTester(1, FastSearcherTester.selfHostname + ":9999:0"); tester.search("?query=test"); - assertEquals(0, tester.requestCount(FastSearcherTester.selfHostname, 9999)); + assertEquals("The FastSearcher has used the local search node connection", 1, tester.requestCount(FastSearcherTester.selfHostname, 9999)); } @Test diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java index 0643e8d77f1..bee9aa90f56 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ public class HitRendererTestCase { diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java index 010a54160e9..185bcae424a 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java @@ -7,7 +7,7 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ public class GroupingTransformTestCase { |