Try and fail to stop the SearchResponse leaks

williamrandolph · Mar 30, 2024 · a7134ab · a7134ab
1 parent 86b36fe
commit a7134ab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/modules/kibana/src/test/java/org/elasticsearch/kibana/KibanaThreadPoolTests.java b/modules/kibana/src/test/java/org/elasticsearch/kibana/KibanaThreadPoolTests.java
@@ -10,6 +10,7 @@
 
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.support.WriteRequest;
+import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.indices.SystemIndexThreadPoolTests;
 import org.elasticsearch.plugins.Plugin;
@@ -34,17 +35,18 @@ public void testKibanaThreadPool() {
             String idToUpdate = client().prepareIndex(".kibana").setSource(Map.of("foo", "update me!")).get().getId();
 
             // bulk index, delete, and update
-            BulkResponse response = client().prepareBulk(".kibana")
-                .add(client().prepareIndex(".kibana").setSource(Map.of("foo", "search me!")))
-                .add(client().prepareDelete(".kibana", idToDelete))
-                .add(client().prepareUpdate().setId(idToUpdate).setDoc(Map.of("foo", "I'm updated!")))
+            Client bulkClient = client();
+            BulkResponse response = bulkClient.prepareBulk(".kibana")
+                .add(bulkClient.prepareIndex(".kibana").setSource(Map.of("foo", "search me!")))
+                .add(bulkClient.prepareDelete(".kibana", idToDelete))
+                .add(bulkClient.prepareUpdate().setId(idToUpdate).setDoc(Map.of("foo", "I'm updated!")))
                 .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
                 .get();
             assertFalse(response.hasFailures());
 
             // match-all search
-            var results = client().prepareSearch(".kibana").setQuery(QueryBuilders.matchAllQuery()).get();
-            assertThat(results.getHits().getHits().length, equalTo(2));
+            var searchResponse = client().prepareSearch(".kibana").setQuery(QueryBuilders.matchAllQuery()).get();
+            assertThat(searchResponse.getHits().getHits().length, equalTo(2));
         });
     }
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/indices/SystemIndexThreadPoolTests.java b/test/framework/src/main/java/org/elasticsearch/indices/SystemIndexThreadPoolTests.java
@@ -59,7 +59,7 @@ private void assertThreadPoolsBlocked() {
     }
 
     protected void runWithBlockedThreadPools(Runnable runnable) {
-        ThreadPool threadPool = internalCluster().getInstance(ThreadPool.class);
+        ThreadPool threadPool = internalCluster().getDataNodeInstance(ThreadPool.class);
         int numThreadsToBlock = threadPoolsToBlock().stream().map(threadPool::info).mapToInt(ThreadPool.Info::getMax).sum();
         CyclicBarrier cb = new CyclicBarrier(numThreadsToBlock + 1);
         Runnable waitAction = () -> {