Skip to content

Commit badef87

Browse files
committed
restore compute-group description
1 parent 261ed18 commit badef87

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ClusterComputeHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void startComputeOnRemoteCluster(
110110
groupTask = rootTask;
111111
onGroupFailure = cancelQueryOnFailure;
112112
} else {
113-
groupTask = computeService.createGroupTask(rootTask);
113+
groupTask = computeService.createGroupTask(rootTask, () -> "compute group: cluster [" + clusterAlias + "]");
114114
onGroupFailure = computeService.cancelQueryOnFailure(groupTask);
115115
l = ActionListener.runAfter(l, () -> transportService.getTaskManager().unregister(groupTask));
116116
}

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ComputeService.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -414,15 +414,12 @@ Runnable cancelQueryOnFailure(CancellableTask task) {
414414
});
415415
}
416416

417-
CancellableTask createGroupTask(Task parentTask) {
417+
CancellableTask createGroupTask(Task parentTask, Supplier<String> description) {
418418
final TaskManager taskManager = transportService.getTaskManager();
419419
return (CancellableTask) taskManager.register(
420420
"transport",
421421
"esql_compute_group",
422-
new ComputeGroupTaskRequest(
423-
parentTask.taskInfo(transportService.getLocalNode().getId(), false).taskId(),
424-
parentTask::getDescription
425-
)
422+
new ComputeGroupTaskRequest(parentTask.taskInfo(transportService.getLocalNode().getId(), false).taskId(), description)
426423
);
427424
}
428425

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/DataNodeComputeHandler.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,10 @@ protected void sendRequest(
130130
final Runnable onGroupFailure;
131131
final CancellableTask groupTask;
132132
if (allowPartialResults) {
133-
groupTask = computeService.createGroupTask(parentTask);
133+
groupTask = computeService.createGroupTask(
134+
parentTask,
135+
() -> "compute group: data-node [" + node.getName() + "], " + shardIds + " [" + shardIds + "]"
136+
);
134137
onGroupFailure = computeService.cancelQueryOnFailure(groupTask);
135138
l = ActionListener.runAfter(l, () -> transportService.getTaskManager().unregister(groupTask));
136139
} else {

0 commit comments

Comments
 (0)