Skip to content

Simplify exchange release logic #128084

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 2 commits into from
May 20, 2025
Merged

Simplify exchange release logic #128084

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5498905
Simplify exchange release logic
idegtiarenko May 15, 2025
659818e
Merge branch 'main' into simplify_sink_release_logic
idegtiarenko May 20, 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
12 changes: 5 additions & 7 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 @@ -248,9 +248,6 @@ private class DataNodeRequestExecutor {
}

void start() {
parentTask.addListener(
() -> exchangeService.finishSinkHandler(request.sessionId(), new TaskCancelledException(parentTask.getReasonCancelled()))
);
runBatch(0);
}

Expand Down Expand Up @@ -419,7 +416,12 @@ private void runComputeOnDataNode(
var parentListener = computeListener.acquireAvoid();
try {
// run compute with target shards
var externalSink = exchangeService.getSinkHandler(externalId);
var internalSink = exchangeService.createSinkHandler(request.sessionId(), request.pragmas().exchangeBufferSize());
task.addListener(() -> {
exchangeService.finishSinkHandler(externalId, new TaskCancelledException(task.getReasonCancelled()));
exchangeService.finishSinkHandler(request.sessionId(), new TaskCancelledException(task.getReasonCancelled()));
});
DataNodeRequestExecutor dataNodeRequestExecutor = new DataNodeRequestExecutor(
request,
task,
Expand All @@ -431,10 +433,6 @@ private void runComputeOnDataNode(
);
dataNodeRequestExecutor.start();
// run the node-level reduction
var externalSink = exchangeService.getSinkHandler(externalId);
task.addListener(
() -> exchangeService.finishSinkHandler(externalId, new TaskCancelledException(task.getReasonCancelled()))
);
var exchangeSource = new ExchangeSourceHandler(1, esqlExecutor);
exchangeSource.addRemoteSink(internalSink::fetchPageAsync, true, () -> {}, 1, ActionListener.noop());
var reductionListener = computeListener.acquireCompute();
Expand Down