Skip to content

Make qa/full-cluster-restart tests pass. By fixing a helper method and #38604

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 1 commit into from
Feb 8, 2019
Merged

Make qa/full-cluster-restart tests pass. By fixing a helper method and #38604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,7 @@ public void testRecovery() throws Exception {
* old and new versions. All of the snapshots include an index, a template,
* and some routing configuration.
*/
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/38603")
public void testSnapshotRestore() throws IOException {
int count;
if (isRunningAgainstOldCluster() && getOldClusterVersion().major < 8) {
Expand Down Expand Up @@ -1214,7 +1215,7 @@ private void saveInfoDocument(String type, String value) throws IOException {
private String loadInfoDocument(String type) throws IOException {
Request request = new Request("GET", "/info/" + this.type + "/" + index + "_" + type);
request.addParameter("filter_path", "_source");
if (isRunningAgainstAncientCluster()) {
if (getOldClusterVersion().before(Version.V_6_7_0)) {
Copy link
Member Author

@martijnvg martijnvg Feb 8, 2019

Choose a reason for hiding this comment

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

Whether a warning is expected, depends on whether type doc in this.type is used and that depends on whether the old cluster was before 6.7.0

request.setOptions(expectWarnings(RestGetAction.TYPES_DEPRECATION_MESSAGE));
}
String doc = toStr(client().performRequest(request));
Expand Down