Skip to content

Correct assertions on profiling action cancel #92046

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
danielmitterdorfer merged 3 commits into from
Dec 2, 2022
Merged

Correct assertions on profiling action cancel #92046

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acba649
Correct assertions on profiling action cancel
danielmitterdorfer Dec 1, 2022
c3aaba7
Merge branch 'main' into reviews/danielmitterdorfer/2022-12-01-fix-92039
DaveCTurner Dec 1, 2022
d658f4d
Unmute test
DaveCTurner Dec 1, 2022
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
17 changes: 13 additions & 4 deletions ...r/src/internalClusterTest/java/org/elasticsearch/xpack/profiler/GetProfilingActionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ public void testGetProfilingDataUnfiltered() throws Exception {
assertNotNull("libc.so.6", response.getExecutables().get("QCCDqjSg3bMK1C4YRK6Tiw"));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/92039")
public void testAutomaticCancellation() throws Exception {
Request restRequest = new Request("POST", "/_profiling/stacktraces");
restRequest.setEntity(new StringEntity("""
Expand Down Expand Up @@ -223,7 +222,13 @@ private static Collection<TaskId> collectProfilingRelatedTasks(String transportA
}
}
assertNotNull(profilingTask.get());
return taskToParent.get(profilingTask.get().taskId());
Set<TaskId> childTaskIds = taskToParent.get(profilingTask.get().taskId());
Set<TaskId> profilingTaskIds = new HashSet<>();
profilingTaskIds.add(profilingTask.get().taskId());
if (childTaskIds != null) {
profilingTaskIds.addAll(childTaskIds);
}
return profilingTaskIds;
}

private static void ensureTasksAreCancelled(Collection<TaskId> taskIds, Function<String, String> nodeIdToName) throws Exception {
Expand All @@ -232,8 +237,12 @@ private static void ensureTasksAreCancelled(Collection<TaskId> taskIds, Function
String nodeName = nodeIdToName.apply(taskId.getNodeId());
TaskManager taskManager = internalCluster().getInstance(TransportService.class, nodeName).getTaskManager();
Task task = taskManager.getTask(taskId.getId());
assertThat(task, instanceOf(CancellableTask.class));
assertTrue(((CancellableTask) task).isCancelled());
// as we capture the task hierarchy at the beginning but cancel in the middle of execution, some tasks have been
// unregistered already by the time we verify cancellation.
if (task != null) {
assertThat(task, instanceOf(CancellableTask.class));
assertTrue(((CancellableTask) task).isCancelled());
}
}
});
}
Expand Down