Skip to content

Prevent closing wrong search contexts in compute service #128222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 21, 2025
Merged

Prevent closing wrong search contexts in compute service #128222

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85262a1
Prevent closing wrong search contexts in compute service
dnhatn May 20, 2025
6a89947
smaller
dnhatn May 21, 2025
90d2fc0
Merge remote-tracking branch 'elastic/main' into fix-search-contexts
dnhatn May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,6 @@ tests:
- class: org.elasticsearch.packaging.test.DockerTests
method: test026InstallBundledRepositoryPluginsViaConfigFile
issue: https://github.com/elastic/elasticsearch/issues/127158
- class: org.elasticsearch.xpack.esql.plugin.DataNodeRequestSenderIT
method: testSearchWhileRelocating
issue: https://github.com/elastic/elasticsearch/issues/127188
- class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS2EnrichUnavailableRemotesIT
method: testEsqlEnrichWithSkipUnavailable
issue: https://github.com/elastic/elasticsearch/issues/127368
Expand Down
5 changes: 3 additions & 2 deletions ...plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/DataNodeComputeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@ private void acquireSearchContexts(
}
final var doAcquire = ActionRunnable.supply(listener, () -> {
final List<SearchContext> searchContexts = new ArrayList<>(targetShards.size());
SearchContext context = null;
for (IndexShard shard : targetShards) {
SearchContext context = null;
try {
var aliasFilter = aliasFilters.getOrDefault(shard.shardId().getIndex(), AliasFilter.EMPTY);
var shardRequest = new ShardSearchRequest(
Expand All @@ -342,15 +342,16 @@ private void acquireSearchContexts(
// we need to limit the number of active search contexts here or in SearchService
context = searchService.createSearchContext(shardRequest, SearchService.NO_TIMEOUT);
context.preProcess();
searchContexts.add(context);
} catch (Exception e) {
if (addShardLevelFailure(shard.shardId(), e)) {
IOUtils.close(context);
continue;
} else {
IOUtils.closeWhileHandlingException(context, () -> IOUtils.close(searchContexts));
throw e;
}
}
searchContexts.add(context);
Copy link
Contributor

@idegtiarenko idegtiarenko May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: I believe it is a bit more readable if context is added in the end of the try block as this emphasizes it is only added when operation is completely successful. Otherwise it looks like a null could be added to a collection sometimes.

Copy link
Member Author

@dnhatn dnhatn May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I've updated this in 6a89947

}
return searchContexts;
});
Expand Down