Validate cluster UUID when joining Zen1 cluster #41063
Merged
Conversation
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
Today we fail to join a Zen2 cluster if the cluster UUID does not match our own, but we do not perform the same validation when joining a Zen1 cluster. This means that a Zen2 node will pass join validation and be added to a Zen1 cluster but will reject all cluster states from the master. Relates elastic#37775
DaveCTurner
added
>bug
:Distributed Coordination/Cluster Coordination
Collaborator
|
Pinging @elastic/es-distributed |
Contributor
Author
|
I will forward-port the relevant part of this test to |
henningandersen
approved these changes
Apr 12, 2019
Contributor
henningandersen
left a comment
henningandersen
left a comment
There was a problem hiding this comment.
LGTM.
Thanks @DaveCTurner , I added two optional comments to consider.
| localState.metaData().clusterUUID().equals(request.getState().metaData().clusterUUID()) == false) { | ||
| throw new CoordinationStateRejectedException("join validation on cluster state" + | ||
| " with a different cluster uuid " + request.getState().metaData().clusterUUID() + | ||
| " than local cluster uuid " + localState.metaData().clusterUUID() + ", rejecting"); |
Contributor
There was a problem hiding this comment.
Perhaps add a zen1 marker to the message to aid in debugging?
Contributor
Author
There was a problem hiding this comment.
Sure, I added mixed-version cluster to the Zen1 case.
| transportService.acceptIncomingRequests(); | ||
|
|
||
| { | ||
| final ClusterState otherClusterState = ClusterState.builder(ClusterName.DEFAULT).metaData(MetaData.builder() |
Contributor
There was a problem hiding this comment.
The two blocks for zen1 and zen2 are identical except for the action name, I would prefer to extract the method to make this clear.
DaveCTurner
deleted the
2019-04-10-validate-cluster-uuid-with-legacy-join-validation
branch
DaveCTurner
added a commit
that referenced
this pull request
Apr 16, 2019
Today we fail to join a Zen2 cluster if the cluster UUID does not match our own, but we do not perform the same validation when joining a Zen1 cluster. This means that a Zen2 node will pass join validation and be added to a Zen1 cluster but will reject all cluster states from the master. Relates #37775
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Apr 16, 2019
This is a forward-port of parts of elastic#41063 to `master`, adding a test to show that join validation does indeed verify that the cluster UUIDs match. Relates elastic#37775
DaveCTurner
added a commit
that referenced
this pull request
Apr 16, 2019
gurkankaymak
pushed a commit
to gurkankaymak/elasticsearch
that referenced
this pull request
May 27, 2019
This is a forward-port of parts of elastic#41063 to `master`, adding a test to show that join validation does indeed verify that the cluster UUIDs match. Relates elastic#37775
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.
Today we fail to join a Zen2 cluster if the cluster UUID does not match our
own, but we do not perform the same validation when joining a Zen1 cluster.
This means that a Zen2 node will pass join validation and be added to a Zen1
cluster but will reject all cluster states from the master.
Relates #37775