diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-11-04 14:04:18 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-11-04 14:04:18 +0100 |
commit | 7ac2dbbaa124393cdbb8cb1f1c88fa01a73b48ff (patch) | |
tree | 3c54e6e5ee78f16106d69cf5f65aa9750d33b0f3 /container-search | |
parent | d99e553e2b8358203dcbb0edde53ae14b51042a7 (diff) |
FastSearcher must not call shutdown on the dispatcher, as it does not own it.
The dispatcher has a life independant og the BackendSearchers and should properly self destruct.
Diffstat (limited to 'container-search')
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java | 6 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java | 7 |
2 files changed, 3 insertions, 10 deletions
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 9a4913b3840..1a373b6ea71 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 @@ -172,10 +172,4 @@ public class FastSearcher extends VespaBackEndSearcher { protected boolean isLoggingFine() { return getLogger().isLoggable(Level.FINE); } - - @Override - public void shutDown() { - super.shutDown(); - dispatcher.shutDown(); - } } 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 73e5af50788..1f58a2df5c2 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 @@ -101,6 +101,7 @@ public class Dispatcher extends AbstractComponent { metric); } + /* Protected for simple mocking in tests. Beware that searchCluster is shutdown on in deconstruct() */ protected Dispatcher(SearchCluster searchCluster, DispatchConfig dispatchConfig, RpcInvokerFactory rcpInvokerFactory, @@ -108,6 +109,7 @@ public class Dispatcher extends AbstractComponent { this(searchCluster, dispatchConfig, rcpInvokerFactory, rcpInvokerFactory, metric); } + /* Protected for simple mocking in tests. Beware that searchCluster is shutdown on in deconstruct() */ protected Dispatcher(SearchCluster searchCluster, DispatchConfig dispatchConfig, InvokerFactory invokerFactory, @@ -132,6 +134,7 @@ public class Dispatcher extends AbstractComponent { @Override public void deconstruct() { invokerFactory.release(); + searchCluster.shutDown(); } public Optional<FillInvoker> getFillInvoker(Result result, VespaBackEndSearcher searcher) { @@ -214,10 +217,6 @@ public class Dispatcher extends AbstractComponent { return Optional.empty(); } - public void shutDown() { - searchCluster.shutDown(); - } - private void emitDispatchMetric(Optional<SearchInvoker> invoker) { if (invoker.isEmpty()) { metric.add(FDISPATCH_METRIC, 1, metricContext); |