honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Further simplify cluster state update task execution ordering test

This commit is contained in:
Jason Tedor 2016-01-01 12:50:50 -05:00
parent 18b42ce798
commit d1b4cf6778
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/test/java/org/elasticsearch/cluster/ClusterServiceIT.java
View File

@ -806,18 +806,11 @@ public class ClusterServiceIT extends ESIntegTestCase {
ClusterService clusterService = internalCluster().getInstance(ClusterService.class); ClusterService clusterService = internalCluster().getInstance(ClusterService.class);
class TaskExecutor implements ClusterStateTaskExecutor<Integer> { class TaskExecutor implements ClusterStateTaskExecutor<Integer> {
int tracking = 0; List<Integer> tasks = new ArrayList<>();
@Override @Override
public BatchResult<Integer> execute(ClusterState currentState, List<Integer> tasks) throws Exception { public BatchResult<Integer> execute(ClusterState currentState, List<Integer> tasks) throws Exception {
for (Integer task : tasks) { this.tasks.addAll(tasks);
try {
assertEquals("task was executed out of order", tracking, (int)task);
tracking++;
} catch (AssertionError e) {
return BatchResult.<Integer>builder().failures(tasks, e).build(currentState);
}
}
return BatchResult.<Integer>builder().successes(tasks).build(ClusterState.builder(currentState).build()); return BatchResult.<Integer>builder().successes(tasks).build(ClusterState.builder(currentState).build());
} }
@ -841,7 +834,7 @@ public class ClusterServiceIT extends ESIntegTestCase {
ClusterStateTaskListener listener = new ClusterStateTaskListener() { ClusterStateTaskListener listener = new ClusterStateTaskListener() {
@Override @Override
public void onFailure(String source, Throwable t) { public void onFailure(String source, Throwable t) {
logger.debug("failure: [{}]", t, source); logger.debug("unexpected failure: [{}]", t, source);
failure.set(true); failure.set(true);
updateLatch.countDown(); updateLatch.countDown();
} }
@ -886,7 +879,11 @@ public class ClusterServiceIT extends ESIntegTestCase {
assertFalse(failure.get()); assertFalse(failure.get());
for (int i = 0; i < numberOfThreads; i++) { for (int i = 0; i < numberOfThreads; i++) {
assertEquals(tasksSubmittedPerThread, executors[i].tracking); assertEquals(tasksSubmittedPerThread, executors[i].tasks.size());
for (int j = 0; j < tasksSubmittedPerThread; j++) {
assertNotNull(executors[i].tasks.get(j));
assertEquals("cluster state update task executed out of order", j, (int)executors[i].tasks.get(j));
}
} }
} }