Skip to content

Commit 1c94264

Browse files
committed
update TransportSearchAction to mitigate test failure
1 parent 098140e commit 1c94264

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,6 @@ tests:
212212
- class: org.elasticsearch.action.RejectionActionIT
213213
method: testSimulatedSearchRejectionLoad
214214
issue: https://github.com/elastic/elasticsearch/issues/125901
215-
- class: org.elasticsearch.search.basic.SearchWithRandomDisconnectsIT
216-
method: testSearchWithRandomDisconnects
217-
issue: https://github.com/elastic/elasticsearch/issues/122707
218215
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
219216
method: test {p0=transform/transforms_reset/Test force reseting a running transform}
220217
issue: https://github.com/elastic/elasticsearch/issues/126240

server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,6 +1618,7 @@ public void runNewSearchPhase(
16181618
shardIterators.size(),
16191619
exc -> searchTransportService.cancelSearchTask(task, "failed to merge result [" + exc.getMessage() + "]")
16201620
);
1621+
final ActionListener<SearchResponse> releasingListener = ActionListener.runAfter(listener, queryResultConsumer::close);
16211622
boolean success = false;
16221623
try {
16231624
final AbstractSearchAsyncAction<?> searchPhase;
@@ -1632,7 +1633,7 @@ public void runNewSearchPhase(
16321633
executor,
16331634
queryResultConsumer,
16341635
searchRequest,
1635-
listener,
1636+
releasingListener,
16361637
shardIterators,
16371638
timeProvider,
16381639
clusterState,
@@ -1652,7 +1653,7 @@ public void runNewSearchPhase(
16521653
executor,
16531654
queryResultConsumer,
16541655
searchRequest,
1655-
listener,
1656+
releasingListener,
16561657
shardIterators,
16571658
timeProvider,
16581659
clusterState,

0 commit comments

Comments
 (0)