diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-11-18 23:01:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-18 23:01:00 +0100 |
commit | 812f5b1608a1f2d124c321cb6335fd69f0f0736b (patch) | |
tree | 451baa08aea435f82e476a5ed35f709ae8468e24 | |
parent | e71b311a5a54be38ff4538edfe53b7b46a974c8b (diff) | |
parent | 90037065f19c12422f7c96b3396a67438c6c028b (diff) |
Merge pull request #7679 from vespa-engine/ollivir/group-affinity-with-searchpath
Java dispatcher group affinity through searchPath
3 files changed, 13 insertions, 13 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 39fc0d31681..0382f47457e 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 @@ -115,6 +115,7 @@ public class Dispatcher extends AbstractComponent { if (nodes.isEmpty()) { return Optional.empty(); } else { + query.trace(false, 2, "Dispatching internally with search path ", searchPath); return invokerFactory.supply(query, -1, nodes, true); } } catch (InvalidSearchPathException e) { @@ -133,7 +134,7 @@ public class Dispatcher extends AbstractComponent { int max = Integer.min(searchCluster.orderedGroups().size(), MAX_GROUP_SELECTION_ATTEMPTS); Set<Integer> rejected = null; for (int i = 0; i < max; i++) { - Optional<Group> groupInCluster = loadBalancer.takeGroupForQuery(query, rejected); + Optional<Group> groupInCluster = loadBalancer.takeGroupForQuery(rejected); if (!groupInCluster.isPresent()) { // No groups available break; @@ -142,7 +143,8 @@ public class Dispatcher extends AbstractComponent { boolean acceptIncompleteCoverage = (i == max - 1); Optional<SearchInvoker> invoker = invokerFactory.supply(query, group.id(), group.nodes(), acceptIncompleteCoverage); if (invoker.isPresent()) { - query.trace(false, 2, "Dispatching internally to ", group); + query.trace(false, 2, "Dispatching internally to search group ", group.id()); + query.getModel().setSearchPath("/" + group.id()); invoker.get().teardown(() -> loadBalancer.releaseGroup(group)); return invoker; } else { diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/LoadBalancer.java b/container-search/src/main/java/com/yahoo/search/dispatch/LoadBalancer.java index 22573fac2d9..222ae6a4ea0 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/LoadBalancer.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/LoadBalancer.java @@ -48,11 +48,10 @@ public class LoadBalancer { * Select and allocate the search cluster group which is to be used for the provided query. Callers <b>must</b> call * {@link #releaseGroup} symmetrically for each taken allocation. * - * @param query the query for which this allocation is made * @param rejectedGroups if not null, the load balancer will only return groups with IDs not in the set * @return The node group to target, or <i>empty</i> if the internal dispatch logic cannot be used */ - public Optional<Group> takeGroupForQuery(Query query, Set<Integer> rejectedGroups) { + public Optional<Group> takeGroupForQuery(Set<Integer> rejectedGroups) { if (scoreboard == null) { return Optional.empty(); } diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java index 31d1399e3bb..38a753360d8 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java @@ -1,7 +1,6 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.dispatch; -import com.yahoo.search.Query; import com.yahoo.search.dispatch.searchcluster.Group; import com.yahoo.search.dispatch.searchcluster.Node; import com.yahoo.search.dispatch.searchcluster.SearchCluster; @@ -26,7 +25,7 @@ public class LoadBalancerTest { SearchCluster cluster = new SearchCluster("a", 88.0, 99.0, 0, Arrays.asList(n1), null, 1, null); LoadBalancer lb = new LoadBalancer(cluster, true); - Optional<Group> grp = lb.takeGroupForQuery(new Query(), null); + Optional<Group> grp = lb.takeGroupForQuery(null); Group group = grp.orElseGet(() -> { throw new AssertionFailedError("Expected a SearchCluster.Group"); }); @@ -40,7 +39,7 @@ public class LoadBalancerTest { SearchCluster cluster = new SearchCluster("a", 88.0, 99.0, 0, Arrays.asList(n1, n2), null, 1, null); LoadBalancer lb = new LoadBalancer(cluster, true); - Optional<Group> grp = lb.takeGroupForQuery(new Query(), null); + Optional<Group> grp = lb.takeGroupForQuery(null); Group group = grp.orElseGet(() -> { throw new AssertionFailedError("Expected a SearchCluster.Group"); }); @@ -56,7 +55,7 @@ public class LoadBalancerTest { SearchCluster cluster = new SearchCluster("a", 88.0, 99.0, 0, Arrays.asList(n1, n2, n3, n4), null, 2, null); LoadBalancer lb = new LoadBalancer(cluster, true); - Optional<Group> grp = lb.takeGroupForQuery(new Query(), null); + Optional<Group> grp = lb.takeGroupForQuery(null); assertThat(grp.isPresent(), is(true)); } @@ -68,14 +67,14 @@ public class LoadBalancerTest { LoadBalancer lb = new LoadBalancer(cluster, true); // get first group - Optional<Group> grp = lb.takeGroupForQuery(new Query(), null); + Optional<Group> grp = lb.takeGroupForQuery(null); Group group = grp.get(); int id1 = group.id(); // release allocation lb.releaseGroup(group); // get second group - grp = lb.takeGroupForQuery(new Query(), null); + grp = lb.takeGroupForQuery(null); group = grp.get(); assertThat(group.id(), not(equalTo(id1))); } @@ -88,12 +87,12 @@ public class LoadBalancerTest { LoadBalancer lb = new LoadBalancer(cluster, true); // get first group - Optional<Group> grp = lb.takeGroupForQuery(new Query(), null); + Optional<Group> grp = lb.takeGroupForQuery(null); Group group = grp.get(); int id1 = group.id(); // get second group - grp = lb.takeGroupForQuery(new Query(), null); + grp = lb.takeGroupForQuery(null); group = grp.get(); int id2 = group.id(); assertThat(id2, not(equalTo(id1))); @@ -101,7 +100,7 @@ public class LoadBalancerTest { lb.releaseGroup(group); // get third group - grp = lb.takeGroupForQuery(new Query(), null); + grp = lb.takeGroupForQuery(null); group = grp.get(); assertThat(group.id(), equalTo(id2)); } |