Fix FullClusterRestartIT#testSnapshotRestore#38795
Merged
cbuescher merged 5 commits intoelastic:7.xfrom Feb 15, 2019
Merged
Conversation
This test failed on 7.1 when running full cluster restart tests against pre-7.0 clusters (e.g. 6.6 clusters). The fix includes adding the "include_type_name" parameter to the template requests only if the template uses types (if we are testing restarts from pre-7 verions) and fixed the expected type in the templates after the cluster restart (custom type names like "doc" which are still possible e.g. in 6.6 are converted to "_doc" on post-7 clusters). Closes elastic#38603
Collaborator
|
Pinging @elastic/es-search |
jtibshirani
reviewed
Feb 14, 2019
Contributor
jtibshirani
left a comment
There was a problem hiding this comment.
Thanks @cbuescher for working on fixing this. I left a couple questions to make sure I understand the approach.
qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
Outdated
Show resolved
Hide resolved
qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
Outdated
Show resolved
Hide resolved
Member
Author
|
@jtibshirani thanks, I hope I was able to answer you questions and updated the comment a bit. Hope this is okay now. |
Member
Author
|
@cbuescher I understand your confusion, I left a short explanation, let me know if I should elaborate on the comment further. I'm glad these edge cases are gone again on master. |
added 2 commits
February 15, 2019 11:22
Member
Author
|
@jtibshirani thanks, I pushed another commit with your latest suggestion so this is ready for a final look. |
cbuescher
pushed a commit
that referenced
this pull request
Feb 15, 2019
As a follow up to #38795 this PR removes a lot of special case handling that was necessary for full cluster restart checks going from 6.x to 7.x clusters but are not required anymore going from 7 to 8.
jtibshirani
approved these changes
Feb 15, 2019
qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
Outdated
Show resolved
Hide resolved
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This test failed on 7.1 when running full cluster restart tests against pre-7.0
clusters (e.g. 6.6 clusters). The fix includes adding the "include_type_name"
parameter to the template requests only if the template uses types (if we are
testing restarts from pre-7 verions) and fixed the expected type in the
templates after the cluster restart (custom type names like "doc" which are
still possible e.g. in 6.6 are converted to "_doc" on post-7 clusters).
Closes #38603