From d60fabf77bce914602d8524ac9a014a8b35c6f2d Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Thu, 21 May 2020 14:48:51 -0400 Subject: [PATCH 1/2] Fix testTrackingChannelTask --- .../java/org/elasticsearch/tasks/TaskManagerTests.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java b/server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java index e73b4bc0d5734..e5f3765452ae9 100644 --- a/server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java +++ b/server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java @@ -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 { @@ -76,7 +78,6 @@ 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 cancelledTasks = ConcurrentCollections.newConcurrentSet(); @@ -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(); } From 2597ff7bac572865300c25bd0267642d259de7a3 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Thu, 21 May 2020 15:10:23 -0400 Subject: [PATCH 2/2] fix assertion --- .../src/test/java/org/elasticsearch/tasks/TaskManagerTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java b/server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java index e5f3765452ae9..0f44016695bbc 100644 --- a/server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java +++ b/server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java @@ -80,7 +80,7 @@ public void testResultsServiceRetryTotalTime() { public void testTrackingChannelTask() throws Exception { final TaskManager taskManager = new TaskManager(Settings.EMPTY, threadPool, Set.of()); - Set cancelledTasks = ConcurrentCollections.newConcurrentSet(); + Set cancelledTasks = ConcurrentCollections.newConcurrentSet(); taskManager.setTaskCancellationService(new TaskCancellationService(mock(TransportService.class)) { @Override void cancelTaskAndDescendants(CancellableTask task, String reason, boolean waitForCompletion, ActionListener listener) {