Need a delayed close for the connections no longer needed.

1 files changed, 11 insertions, 5 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java
index ff37352b39c..7c1e7372507 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java
@@ -73,8 +73,14 @@ public class RpcSearchInvokerTest {
         assertEquals(maxHits, request.getHits());
     }
 
-    void verifyConnections(RpcResourcePool rpcResourcePool, int numGroups, int nodesPerGroup) {
-        rpcResourcePool.updateNodes(createNodesConfig(numGroups,nodesPerGroup));
+    void verifyConnections(RpcResourcePool rpcResourcePool, int numGroups, int nodesPerGroup, int expectNeedCloseCount) {
+        var toClose = rpcResourcePool.updateNodes(createNodesConfig(numGroups,nodesPerGroup));
+        assertEquals(expectNeedCloseCount, toClose.size());
+        toClose.forEach(item -> {
+            try {
+                item.close();
+            } catch (Exception e) {}
+        });
         for (int nodeId = 0; nodeId < numGroups*nodesPerGroup; nodeId++) {
             assertTrue(rpcResourcePool.getConnection(nodeId) instanceof RpcClient.RpcNodeConnection);
         }
@@ -84,9 +90,9 @@ public class RpcSearchInvokerTest {
     @Test
     void testUpdateOfRpcResourcePool() {
         RpcResourcePool rpcResourcePool = new RpcResourcePool(createDispatchConfig(), createNodesConfig(0, 0));
-        verifyConnections(rpcResourcePool, 3,3);
-        verifyConnections(rpcResourcePool, 4,4);
-        verifyConnections(rpcResourcePool, 2,2);
+        verifyConnections(rpcResourcePool, 3,3, 0);
+        verifyConnections(rpcResourcePool, 4,4, 6);
+        verifyConnections(rpcResourcePool, 2,2, 14);
     }
 
     private Client parameterCollectorClient(AtomicReference<CompressionType> compressionTypeHolder, AtomicReference<byte[]> payloadHolder,