Zen2: Move all mixed-version REST tests to Zen2#36398
Merged
ywelsch merged 8 commits intoelastic:masterfrom Dec 10, 2018
Merged
Zen2: Move all mixed-version REST tests to Zen2#36398ywelsch merged 8 commits intoelastic:masterfrom
ywelsch merged 8 commits intoelastic:masterfrom
Conversation
Collaborator
|
Pinging @elastic/es-distributed |
DaveCTurner
requested changes
Dec 8, 2018
Member
DaveCTurner
left a comment
There was a problem hiding this comment.
Mostly looks good but I have questioned a couple of the test fixes.
...a/org/elasticsearch/action/admin/cluster/bootstrap/TransportBootstrapClusterActionTests.java
Outdated
Show resolved
Hide resolved
...org/elasticsearch/action/admin/cluster/bootstrap/TransportGetDiscoveredNodesActionTests.java
Outdated
Show resolved
Hide resolved
Contributor
Author
|
packaging-sample failed because auto-bootstrapping failed with and ci-2 failed because of #36380 For the first failure, I've tried making that action internal and see if that helps. |
DaveCTurner
reviewed
Dec 8, 2018
| public class GetDiscoveredNodesAction extends Action<GetDiscoveredNodesResponse> { | ||
| public static final GetDiscoveredNodesAction INSTANCE = new GetDiscoveredNodesAction(); | ||
| public static final String NAME = "cluster:monitor/discovered_nodes"; | ||
| public static final String NAME = "internal:cluster/discovered_nodes"; |
Member
There was a problem hiding this comment.
I don't immediately see how this would help, since both are covered by system privileges:
Not that it won't help, just that I don't understand the mechanism.
DaveCTurner
previously approved these changes
Dec 8, 2018
Review comments addressed, but need another look
Contributor
Author
|
@DaveCTurner I figured out the issue: The system context which we set in |
Member
|
Good catch. Does a similar issue exist in |
Contributor
Author
|
Just after a quick look. it seems to me that |
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
4 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.
Moves all remaining (rolling-upgrade and mixed-version) REST tests to use Zen2. To avoid adding extra configuration, it relies on Zen2 being set as the default discovery type. This required a few smaller changes in other tests. I've removed AzureMinimumMasterNodesTests which tests Zen1 functionality and dates from a time where host providers were not configurable and each cloud plugin had its own
discovery.type, subclassing the ZenDiscovery class. I've also adapted a few tests which were unnecessarily addingaddTestZenDiscovery = falsefor the same legacy reasons. Finally, this also moves the unconfigured-node-name REST test to Zen2, testing the auto-bootstrapping functionality in development mode when no discovery configuration is provided.