Skip to content

Fix Rest Tests Failing to Cleanup Rollup Jobs #51246

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 4 commits into from
Jan 22, 2020
Merged

Fix Rest Tests Failing to Cleanup Rollup Jobs #51246

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e089f5
Fix Rest Tests Failing to Cleanup Rollup Jobs
original-brownbear Jan 21, 2020
c2b1540
Merge remote-tracking branch 'elastic/master' into fix-bwc-50819
original-brownbear Jan 21, 2020
351d795
add comment
original-brownbear Jan 21, 2020
e82dcd5
Merge remote-tracking branch 'elastic/master' into fix-bwc-50819
original-brownbear Jan 22, 2020
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
11 changes: 10 additions & 1 deletion 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 @@ -663,7 +663,16 @@ private void wipeClusterSettings() throws IOException {
}

private void wipeRollupJobs() throws IOException {
Response response = adminClient().performRequest(new Request("GET", "/_rollup/job/_all"));
final Response response;
try {
response = adminClient().performRequest(new Request("GET", "/_rollup/job/_all"));
} catch (ResponseException e) {
// If we don't see the rollup endpoint (possibly because of running against an older ES version) we just bail
if (e.getResponse().getStatusLine().getStatusCode() == RestStatus.NOT_FOUND.getStatus()) {
return;
}
Copy link
Member

@nik9000 nik9000 Jan 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is worth adding a comment here explaining why this is ok.

throw e;
}
Map<String, Object> jobs = entityAsMap(response);
@SuppressWarnings("unchecked")
List<Map<String, Object>> jobConfigs =
Expand Down