Test delay shutdown of RPC resources in dispatcher

3 files changed, 13 insertions, 3 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 bae935bb783..6f6b0fc2b79 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
@@ -107,7 +107,7 @@ public class Dispatcher extends AbstractComponent {
 
     public static QueryProfileType getArgumentType() { return argumentType; }
 
-    private interface InvokerFactoryFactory {
+    interface InvokerFactoryFactory {
         InvokerFactory create(RpcConnectionPool rpcConnectionPool, SearchGroups searchGroups, DispatchConfig dispatchConfig);
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/Client.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/Client.java
index 22ed8b6d9fa..6c1f666835c 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/Client.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/Client.java
@@ -12,7 +12,7 @@ import java.util.Optional;
  *
  * @author bratseth
  */
-interface Client {
+public interface Client {
 
     /** Creates a connection to a particular node in this */
     NodeConnection createConnection(String hostname, int port);
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroups.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroups.java
index cdbc3365409..5727931281a 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroups.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroups.java
@@ -1,8 +1,14 @@
 package com.yahoo.search.dispatch.searchcluster;
 
+import com.yahoo.stream.CustomCollectors;
+
 import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
+import static java.util.Comparator.comparingInt;
+import static java.util.stream.Collectors.toCollection;
 import static java.util.stream.Collectors.toSet;
 
 /**
@@ -16,7 +22,11 @@ public interface SearchGroups {
     default boolean isEmpty() {
         return size() == 0;
     }
-    default Set<Node> nodes() { return groups().stream().flatMap(group -> group.nodes().stream()).collect(toSet());}
+    default Set<Node> nodes() {
+        return groups().stream().flatMap(group -> group.nodes().stream())
+                       .sorted(comparingInt(Node::key))
+                       .collect(toCollection(LinkedHashSet::new));
+    }
     int size();
     boolean isPartialGroupCoverageSufficient(Collection<Node> nodes);
 }