Adds wait for task registration to testCanFetchIndexStatus

In the testCanFetchIndexStatus the task check can occur before the indexing process is started making the test to fail. This commit adds an additional lock to make sure we check tasks only after at least one of the tasks is registered.
This commit is contained in:
Igor Motov 2016-02-10 10:38:35 -05:00
parent b2b02f14cb
commit a5406e1ffa
1 changed files with 7 additions and 1 deletions

View File

@ -48,7 +48,9 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Function; import java.util.function.Function;
@ -252,11 +254,14 @@ public class TasksIT extends ESIntegTestCase {
*/ */
ReentrantLock taskFinishLock = new ReentrantLock(); ReentrantLock taskFinishLock = new ReentrantLock();
taskFinishLock.lock(); taskFinishLock.lock();
CountDownLatch taskRegistered = new CountDownLatch(1);
for (ClusterService clusterService : internalCluster().getInstances(ClusterService.class)) { for (ClusterService clusterService : internalCluster().getInstances(ClusterService.class)) {
((MockTaskManager)clusterService.getTaskManager()).addListener(new MockTaskManagerListener() { ((MockTaskManager)clusterService.getTaskManager()).addListener(new MockTaskManagerListener() {
@Override @Override
public void onTaskRegistered(Task task) { public void onTaskRegistered(Task task) {
// Intentional noop if (task.getAction().startsWith(IndexAction.NAME)) {
taskRegistered.countDown();
}
} }
@Override @Override
@ -275,6 +280,7 @@ public class TasksIT extends ESIntegTestCase {
}); });
} }
ListenableActionFuture<?> indexFuture = client().prepareIndex("test", "test").setSource("test", "test").execute(); ListenableActionFuture<?> indexFuture = client().prepareIndex("test", "test").setSource("test", "test").execute();
taskRegistered.await(10, TimeUnit.SECONDS); // waiting for at least one task to be registered
ListTasksResponse tasks = client().admin().cluster().prepareListTasks().setActions("indices:data/write/index*").setDetailed(true) ListTasksResponse tasks = client().admin().cluster().prepareListTasks().setActions("indices:data/write/index*").setDetailed(true)
.get(); .get();
taskFinishLock.unlock(); taskFinishLock.unlock();