Skip to content
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

Rename BecomeMasterTask to BecomeClusterManagerTask in JoinTaskExecutor #3099

Merged

Conversation

tlfeng
Copy link
Collaborator

@tlfeng tlfeng commented Apr 28, 2022

Description

There is a ClusterStateTask with identifier _BECOME_MASTER_TASK_ used to indicate the node to be the cluster manager node when joining the cluster.

To support inclusive language, and finally change the "master" terminology, I made the following plan:

In version 2.0:

  • Deprecate the task identifier _BECOME_MASTER_TASK_
  • Add alternative name _BECOME_CLUSTER_MANAGER_TASK_
  • Modify the method that identify the task isBecomeMasterTask() to accept the 2 names

In version 3.0:

  • Remove the current task identifier _BECOME_MASTER_TASK_

The reason not change the name in-place:
The related methods are public methods, in case there are clients that call these method in a mixed version cluster of 1.x and 2.x, this way can keep the compatibility of using these methods with version 1.x cluster.

Issues Resolved

A part of #1548

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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.

Sorry, something went wrong.

@tlfeng tlfeng added v2.0.0 Version 2.0.0 backport 2.0 Backport to 2.0 branch labels Apr 28, 2022
@tlfeng tlfeng marked this pull request as ready for review April 28, 2022 05:24
@tlfeng tlfeng requested review from a team and reta as code owners April 28, 2022 05:24
@tlfeng tlfeng added v3.0.0 Issues and PRs related to version 3.0.0 backport 2.x Backport to 2.x branch labels Apr 28, 2022
@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success aa53f43
Log 4846

Reports 4846

@tlfeng
Copy link
Collaborator Author

tlfeng commented Apr 28, 2022

@reta and @andrross Thanks a lot for your review! 👍

@dblock dblock merged commit 017773c into opensearch-project:main Apr 28, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

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-3099-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 017773c62d345edac607b4474bac99f200c560f8
# Push it to GitHub
git push --set-upstream origin backport/backport-3099-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 base branch is 2.x and the compare/head branch is backport/backport-3099-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.0 failed:

The process '/usr/bin/git' failed with exit code 1

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.0 2.0
# Navigate to the new working tree
cd .worktrees/backport-2.0
# Create a new branch
git switch --create backport/backport-3099-to-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 017773c62d345edac607b4474bac99f200c560f8
# Push it to GitHub
git push --set-upstream origin backport/backport-3099-to-2.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.0

Then, create a pull request where the base branch is 2.0 and the compare/head branch is backport/backport-3099-to-2.0.

@tlfeng tlfeng deleted the rename-join-cluster-manager-task branch April 28, 2022 22:54
@tlfeng tlfeng added the pending backport Identifies an issue or PR that still needs to be backported label Apr 28, 2022
tlfeng pushed a commit to tlfeng/OpenSearch that referenced this pull request May 4, 2022
@tlfeng tlfeng removed the pending backport Identifies an issue or PR that still needs to be backported label May 4, 2022
dblock pushed a commit that referenced this pull request May 5, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…or (#3099) (#3179)

Signed-off-by: Tianli Feng <[email protected]>
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 5, 2022
…or (#3099) (#3179)

Signed-off-by: Tianli Feng <[email protected]>
(cherry picked from commit 2c3cc0a)
tlfeng pushed a commit that referenced this pull request May 6, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…or (#3099) (#3179) (#3208)

Signed-off-by: Tianli Feng <[email protected]>
(cherry picked from commit 2c3cc0a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport 2.0 Backport to 2.0 branch v2.0.0 Version 2.0.0 v3.0.0 Issues and PRs related to version 3.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants