Skip to content

Start polling after data computation is started #128575

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
Jun 2, 2025
Merged

Start polling after data computation is started #128575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0bd4a8
Start polling after data computation is started
idegtiarenko May 28, 2025
7501fc9
Merge branch 'main' into reorder_commands
idegtiarenko Jun 2, 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
16 changes: 8 additions & 8 deletions .../plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ClusterComputeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,6 @@ void startComputeOnRemoteCluster(
updateExecutionInfo(executionInfo, clusterAlias, finalResponse.get());
return completionInfo;
}))) {
var remoteSink = exchangeService.newRemoteSink(groupTask, childSessionId, transportService, cluster.connection);
exchangeSource.addRemoteSink(
remoteSink,
failFast,
() -> pagesFetched.set(true),
queryPragmas.concurrentExchangeClients(),
computeListener.acquireAvoid()
);
var remotePlan = new RemoteClusterPlan(plan, cluster.concreteIndices, cluster.originalIndices);
var clusterRequest = new ClusterComputeRequest(clusterAlias, childSessionId, configuration, remotePlan);
final ActionListener<ComputeResponse> clusterListener = computeListener.acquireCompute().map(r -> {
Expand All @@ -147,6 +139,14 @@ void startComputeOnRemoteCluster(
TransportRequestOptions.EMPTY,
new ActionListenerResponseHandler<>(clusterListener, ComputeResponse::new, esqlExecutor)
);
var remoteSink = exchangeService.newRemoteSink(groupTask, childSessionId, transportService, cluster.connection);
exchangeSource.addRemoteSink(
remoteSink,
failFast,
() -> pagesFetched.set(true),
queryPragmas.concurrentExchangeClients(),
computeListener.acquireAvoid()
);
}
})
);
Expand Down
16 changes: 8 additions & 8 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 @@ -176,14 +176,6 @@ protected void sendRequest(
try (
var computeListener = new ComputeListener(threadPool, onGroupFailure, l.map(ignored -> nodeResponseRef.get()))
) {
final var remoteSink = exchangeService.newRemoteSink(groupTask, childSessionId, transportService, connection);
exchangeSource.addRemoteSink(
remoteSink,
configuration.allowPartialResults() == false,
pagesFetched::incrementAndGet,
queryPragmas.concurrentExchangeClients(),
computeListener.acquireAvoid()
);
final boolean sameNode = transportService.getLocalNode().getId().equals(connection.getNode().getId());
var dataNodeRequest = new DataNodeRequest(
childSessionId,
Expand All @@ -207,6 +199,14 @@ protected void sendRequest(
return r.completionInfo();
}), DataNodeComputeResponse::new, esqlExecutor)
);
final var remoteSink = exchangeService.newRemoteSink(groupTask, childSessionId, transportService, connection);
exchangeSource.addRemoteSink(
remoteSink,
configuration.allowPartialResults() == false,
pagesFetched::incrementAndGet,
queryPragmas.concurrentExchangeClients(),
computeListener.acquireAvoid()
);
}
})
);
Expand Down