From 34e83218cc7b210137b633bc3e99f9b99dda3e19 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 18 Nov 2019 13:16:54 +0100 Subject: Do rebalancing deployments in the Rebalancer This avoids cases where the Rebalancer chooses a move which turns out to not be legal when actually making the redeployment, causing another node to be selected as target. --- .../src/main/java/com/yahoo/search/dispatch/Dispatcher.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'container-search') 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 ab010001d90..e078ffa685f 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 @@ -90,9 +90,7 @@ public class Dispatcher extends AbstractComponent { metric); } - private Dispatcher(SearchCluster searchCluster, - DispatchConfig dispatchConfig, - Metric metric) { + private Dispatcher(SearchCluster searchCluster, DispatchConfig dispatchConfig, Metric metric) { this(searchCluster, dispatchConfig, new RpcInvokerFactory(new RpcResourcePool(dispatchConfig), searchCluster), @@ -161,7 +159,7 @@ public class Dispatcher extends AbstractComponent { List nodes = SearchPath.selectNodes(searchPath, searchCluster); if (nodes.isEmpty()) return Optional.empty(); - query.trace(false, 2, "Dispatching internally with search path ", searchPath); + query.trace(false, 2, "Dispatching with search path ", searchPath); return invokerFactory.createSearchInvoker(searcher, query, OptionalInt.empty(), nodes, true); } catch (InvalidSearchPathException e) { return Optional.of(new SearchErrorInvoker(ErrorMessage.createIllegalQuery(e.getMessage()))); -- cgit v1.2.3