Skip to content

Fix testTrackingChannelTask #57061

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 25, 2020
Merged

Fix testTrackingChannelTask #57061

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d60fabf
Fix testTrackingChannelTask
dnhatn May 21, 2020
2597ff7
fix assertion
dnhatn May 21, 2020
475069e
Merge branch 'master' into fix-tracking-task
dnhatn May 21, 2020
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
10 changes: 6 additions & 4 deletions server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
import java.util.concurrent.TimeUnit;

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.everyItem;
import static org.hamcrest.Matchers.in;
import static org.mockito.Mockito.mock;

public class TaskManagerTests extends ESTestCase {
Expand Down Expand Up @@ -76,10 +78,9 @@ public void testResultsServiceRetryTotalTime() {
assertEquals(600000L, total);
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/56746")
public void testTrackingChannelTask() throws Exception {
final TaskManager taskManager = new TaskManager(Settings.EMPTY, threadPool, Set.of());
Set<CancellableTask> cancelledTasks = ConcurrentCollections.newConcurrentSet();
Set<Task> cancelledTasks = ConcurrentCollections.newConcurrentSet();
taskManager.setTaskCancellationService(new TaskCancellationService(mock(TransportService.class)) {
@Override
void cancelTaskAndDescendants(CancellableTask task, String reason, boolean waitForCompletion, ActionListener<Void> listener) {
Expand Down Expand Up @@ -111,13 +112,14 @@ void cancelTaskAndDescendants(CancellableTask task, String reason, boolean waitF
pendingTasks.computeIfAbsent(channel, k -> new HashSet<>()).add(task);
stopTrackingTasks.add(() -> {
stopTracking.close();
pendingTasks.get(channel).remove(task);
assertTrue(pendingTasks.get(channel).remove(task));
expectedCancelledTasks.remove(task);
});
} else {
expectedCancelledTasks.add(task);
}
}
assertBusy(() -> assertThat(cancelledTasks, equalTo(expectedCancelledTasks)), 30, TimeUnit.SECONDS);
assertBusy(() -> assertThat(expectedCancelledTasks, everyItem(in(cancelledTasks))), 30, TimeUnit.SECONDS);
for (FakeTcpChannel channel : channels) {
channel.close();
}
Expand Down