-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
[2.x] Deprecated reserved node id '_must_join_elected_master_' that used by DetachClusterCommand and replace with '_must_join_elected_cluster_manager_' #3138
Merged
dblock
merged 1 commit into
opensearch-project:2.x
from
tlfeng:2.x-rename-must-join-elected-master
May 3, 2022
Conversation
This file contains 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
tlfeng
changed the title
Deprecated reserved node id '_must_join_elected_master_' that used by … in DetachClusterCommand and replace with '_must_join_elected_cluster_manager_'
Deprecated reserved node id '_must_join_elected_master_' that used by DetachClusterCommand and replace with '_must_join_elected_cluster_manager_'
May 3, 2022
tlfeng
changed the title
Deprecated reserved node id '_must_join_elected_master_' that used by DetachClusterCommand and replace with '_must_join_elected_cluster_manager_'
[2.x] Deprecated reserved node id '_must_join_elected_master_' that used by DetachClusterCommand and replace with '_must_join_elected_cluster_manager_'
May 3, 2022
… DetachClusterCommand and replace with '_must_join_elected_cluster_manager_' Signed-off-by: Tianli Feng <ftianli@amazon.com>
tlfeng
force-pushed
the
2.x-rename-must-join-elected-master
branch
from
May 3, 2022 03:53
65bdfc4
to
c24d428
Compare
5 tasks
tlfeng
added
backport 2.x
Backport to 2.x branch
backport 2.0
Backport to 2.0 branch
v2.1.0
Issues and PRs related to version 2.1.0
v2.0.0
Version 2.0.0
labels
May 3, 2022
✅ Gradle Check success 65bdfc4be09fa3c0228abc4990b4199b4ae11c66 |
dblock
approved these changes
May 3, 2022
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-3138-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 97a6f2c2f58d6270c94e376b4716445cf98619e2
# Push it to GitHub
git push --set-upstream origin backport/backport-3138-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
tlfeng
added
backport
PRs or issues specific to backporting features or enhancments
and removed
backport 2.x
Backport to 2.x branch
labels
May 3, 2022
@dblock Thanks a lot for your time in reviewing my PR! 🏅 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport
PRs or issues specific to backporting features or enhancments
backport 2.0
Backport to 2.0 branch
v2.0.0
Version 2.0.0
v2.1.0
Issues and PRs related to version 2.1.0
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.
Description
Backport PR #3116 to
2.x
branch.To support inclusive language, replace "master" with "cluster manager".
MUST_JOIN_ELECTED_MASTER
and replace withMUST_JOIN_ELECTED_CLUSTER_MANAGER
inVotingConfiguration
class_must_join_elected_master_
to_must_join_elected_cluster_manager_
VotingConfiguration.MUST_JOIN_ELECTED_MASTER
is only read by ClusterFormationFailureHelper, and make it accept bothMUST_JOIN_ELECTED_MASTER
andMUST_JOIN_ELECTED_CLUSTER_MANAGER
The original
_must_join_elected_master_
is only used as a preserved node id for "Detach Cluster Command" (https://github.com/opensearch-project/OpenSearch/blob/1.3.1/server/src/main/java/org/opensearch/cluster/coordination/DetachClusterCommand.java#L89)."Detach Cluster Command"
./bin/opensearch-node detach-cluster
can detach a node from its cluster by resetting its cluster UUID. The node can then join another cluster with a different UUID._must_join_elected_master_
is set as a node id and used as an identifier for the node processed by "Detach Cluster Command".Issues Resolved
A part of #1548
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.