Skip to content

Wait for cluster to become quiescent between REST tests #24148

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 2 commits into from
Apr 19, 2017
Merged

Wait for cluster to become quiescent between REST tests #24148

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1481e2a
[TEST] ensures REST tests wait for cluster state updates to finish
Apr 18, 2017
8b7cbaa
fix wording
Apr 18, 2017
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
17 changes: 17 additions & 0 deletions test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ public void initClient() throws IOException {
@After
public final void cleanUpCluster() throws Exception {
wipeCluster();
waitForClusterStateUpdatesToFinish();
logIfThereAreRunningTasks();
}

Expand Down Expand Up @@ -253,6 +254,22 @@ private void logIfThereAreRunningTasks() throws InterruptedException, IOExceptio
*/
}

/**
* Waits for the cluster state updates to have been processed, so that no cluster
* state updates are still in-progress when the next test starts.
*/
private void waitForClusterStateUpdatesToFinish() throws Exception {
assertBusy(() -> {
try {
Response response = adminClient().performRequest("GET", "_cluster/pending_tasks");
List<Object> tasks = (List<Object>) entityAsMap(response).get("tasks");
assertTrue(tasks.isEmpty());
} catch (IOException e) {
fail("cannot get cluster's pending tasks: " + e.getMessage());
}
});
}

/**
* Used to obtain settings for the REST client that is used to send REST requests.
*/
Expand Down