|
@@ -154,7 +154,7 @@ public class SearchRestCancellationIT extends HttpSmokeTestCase {
|
|
|
return nodeIdToName;
|
|
|
}
|
|
|
|
|
|
- private static void ensureSearchTaskIsCancelled(Function<String, String> nodeIdToName) {
|
|
|
+ private static void ensureSearchTaskIsCancelled(Function<String, String> nodeIdToName) throws Exception {
|
|
|
SetOnce<TaskInfo> searchTask = new SetOnce<>();
|
|
|
ListTasksResponse listTasksResponse = client().admin().cluster().prepareListTasks().get();
|
|
|
for (TaskInfo task : listTasksResponse.getTasks()) {
|
|
@@ -165,10 +165,12 @@ public class SearchRestCancellationIT extends HttpSmokeTestCase {
|
|
|
assertNotNull(searchTask.get());
|
|
|
TaskId taskId = searchTask.get().getTaskId();
|
|
|
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());
|
|
|
+ assertBusy(() -> {
|
|
|
+ TaskManager taskManager = internalCluster().getInstance(TransportService.class, nodeName).getTaskManager();
|
|
|
+ Task task = taskManager.getTask(taskId.getId());
|
|
|
+ assertThat(task, instanceOf(CancellableTask.class));
|
|
|
+ assertTrue(((CancellableTask)task).isCancelled());
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
private static void indexTestData() {
|