-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Zen2: Move all mixed-version REST tests to Zen2 #36398
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.
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
Conversation
|
Pinging @elastic/es-distributed |
DaveCTurner
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
|
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. |
| 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"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't immediately see how this would help, since both are covered by system privileges:
Lines 19 to 28 in 9f86e99
| "internal:*", | |
| "indices:monitor/*", // added for monitoring | |
| "cluster:monitor/*", // added for monitoring | |
| "cluster:admin/bootstrap_cluster", // for the bootstrap service | |
| "cluster:admin/reroute", // added for DiskThresholdDecider.DiskListener | |
| "indices:admin/mapping/put", // needed for recovery and shrink api | |
| "indices:admin/template/put", // needed for the TemplateUpgradeService | |
| "indices:admin/template/delete", // needed for the TemplateUpgradeService | |
| "indices:admin/seq_no/global_checkpoint_sync*", // needed for global checkpoint syncs | |
| "indices:admin/settings/update" // needed for DiskThresholdMonitor.markIndicesReadOnly |
Not that it won't help, just that I don't understand the mechanism.
Review comments addressed, but need another look
|
@DaveCTurner I figured out the issue: The system context which we set in |
|
Good catch. Does a similar issue exist in |
|
Just after a quick look. it seems to me that |
DaveCTurner
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🎉
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.