Merge pull request #8477 from vespa-engine/ollivir/search-invoker-resource-leak

Fix search invoker resource leak

1 files changed, 6 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
index fd861ab7c02..67be6a5486c 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
@@ -105,8 +105,8 @@ public class InterleavedSearchInvoker extends SearchInvoker implements ResponseM
                     log.fine(() -> "Search timed out with " + askedNodes + " requests made, " + answeredNodes + " responses received");
                     break;
                 } else {
-                    invokers.remove(invoker);
                     mergeResult(invoker.getSearchResult(cacheKey, execution));
+                    ejectInvoker(invoker);
                 }
                 nextTimeout = nextTimeout();
             }
@@ -241,6 +241,11 @@ public class InterleavedSearchInvoker extends SearchInvoker implements ResponseM
         }
     }
 
+    private void ejectInvoker(SearchInvoker invoker) {
+        invokers.remove(invoker);
+        invoker.release();
+    }
+
     @Override
     protected void release() {
         if (!invokers.isEmpty()) {