-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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 and deprecate public methods that contains 'master' in the name in 'server' directory #3647
Merged
tlfeng
merged 16 commits into
opensearch-project:main
from
tlfeng:deprecate-master-method-variable-1
Jul 20, 2022
Merged
Rename and deprecate public methods that contains 'master' in the name in 'server' directory #3647
tlfeng
merged 16 commits into
opensearch-project:main
from
tlfeng:deprecate-master-method-variable-1
Jul 20, 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
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
tlfeng
added
enhancement
Enhancement or improvement to existing feature or request
deprecate
v2.1.0
Issues and PRs related to version 2.1.0
v3.0.0
Issues and PRs related to version 3.0.0
backport 2.x
Backport to 2.x branch
labels
Jun 22, 2022
5 tasks
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com> # Conflicts: # server/src/main/java/org/opensearch/cluster/ClusterStateTaskListener.java # server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java # server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java # server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java # server/src/main/java/org/opensearch/cluster/service/ClusterService.java # server/src/test/java/org/opensearch/cluster/coordination/NodeJoinTests.java # server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.java # server/src/test/java/org/opensearch/cluster/service/ClusterManagerServiceTests.java
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com> # Conflicts: # server/src/main/java/org/opensearch/cluster/service/ClusterService.java # server/src/test/java/org/opensearch/cluster/coordination/NodeJoinTests.java # server/src/test/java/org/opensearch/cluster/service/MasterServiceTests.java
Signed-off-by: Tianli Feng <ftianli@amazon.com>
… JoinTaskExecutor.newBecomeClusterManagerTask() Signed-off-by: Tianli Feng <ftianli@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #3647 +/- ##
============================================
+ Coverage 70.57% 70.59% +0.01%
- Complexity 56679 56780 +101
============================================
Files 4563 4573 +10
Lines 272755 273307 +552
Branches 40040 40081 +41
============================================
+ Hits 192505 192931 +426
- Misses 64014 64129 +115
- Partials 16236 16247 +11
|
…OUT" This reverts commit e9b6385. Signed-off-by: Tianli Feng <ftianli@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
xuezhou25
approved these changes
Jul 20, 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-3647-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1510b942bc05a89928e576300119f62871e5a1fd
# Push it to GitHub
git push --set-upstream origin backport/backport-3647-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
pushed a commit
to tlfeng/OpenSearch
that referenced
this pull request
Jul 20, 2022
…e in 'server' directory (opensearch-project#3647) Signed-off-by: Tianli Feng <ftianli@amazon.com>
This was referenced Jul 20, 2022
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
deprecate
enhancement
Enhancement or improvement to existing feature or request
v2.2.0
v3.0.0
Issues and PRs related to version 3.0.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
To support inclusive language, the
master
terminology is going to be replaced bycluster manager
in the code base.This PR deprecate public and protected methods that contains
master
terminology in the name inserver
directory, except those covered by issue #3542 and #3543. Then alternative methods are created.List of public methods that contain
master
in name that will be deprecated in this PR:The below test classes will not be renamed, because they are used to test the deprecated master node behavior.
Other changes:
JoinTaskExecutor.newBecomeMasterTask()
to useJoinTaskExecutor.newBecomeClusterManagerTask()
Issues Resolved
A part of #3544
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.