diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-09-19 19:15:19 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-09-19 19:15:19 +0200 |
commit | d9a0deeb28c911ccd90d2b618602cec96196d254 (patch) | |
tree | 2c35bbe569f09f8e77c91948ca62d77d7602b6fb /container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java | |
parent | ca11e50b27b343ff8e48e402ec965bd168576834 (diff) |
Revert "Merge pull request #10737 from vespa-engine/revert-10717-bratseth/vip-logic"
This reverts commit ae30a47174b67ca78dc33d21770903b3ee626240, reversing
changes made to 992b73092f0d14beb3ae380904d27886fe4dbc89.
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java index 58f73ea52cc..af34fc3e106 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java @@ -139,7 +139,7 @@ public class Dispatcher extends AbstractComponent { return invoker; } - // build invoker based on searchpath + /** Builds an invoker based on searchpath */ private Optional<SearchInvoker> getSearchPathInvoker(Query query, VespaBackEndSearcher searcher) { String searchPath = query.getModel().getSearchPath(); if (searchPath == null) return Optional.empty(); @@ -156,7 +156,7 @@ public class Dispatcher extends AbstractComponent { } private Optional<SearchInvoker> getInternalInvoker(Query query, VespaBackEndSearcher searcher) { - Optional<Node> directNode = searchCluster.directDispatchTarget(); + Optional<Node> directNode = searchCluster.localCorpusDispatchTarget(); if (directNode.isPresent()) { Node node = directNode.get(); query.trace(false, 2, "Dispatching directly to ", node); @@ -202,4 +202,5 @@ public class Dispatcher extends AbstractComponent { metric.add(INTERNAL_METRIC, 1, metricContext); } } + } |