-
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
[2.x] Load the deprecated master role in a dedocated method instead of in setAdditionalRoles() #4653
Merged
tlfeng
merged 3 commits into
opensearch-project:2.x
from
tlfeng:2.x-master-not-additionalrole
Oct 10, 2022
Merged
[2.x] Load the deprecated master role in a dedocated method instead of in setAdditionalRoles() #4653
tlfeng
merged 3 commits into
opensearch-project:2.x
from
tlfeng:2.x-master-not-additionalrole
Oct 10, 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
…etAdditionalRoles() Signed-off-by: Tianli Feng <ftianli@amazon.com>
tlfeng
changed the title
Load the deprecated master role in a dedocated method instead of in setAdditionalRoles()
[2.x] Load the deprecated master role in a dedocated method instead of in setAdditionalRoles()
Sep 30, 2022
tlfeng
added
enhancement
Enhancement or improvement to existing feature or request
backport
PRs or issues specific to backporting features or enhancments
v2.4.0
'Issues and PRs related to version v2.4.0'
labels
Sep 30, 2022
Gradle Check (Jenkins) Run Completed with:
|
In build 3641:
|
Gradle Check (Jenkins) Run Completed with:
|
xuezhou25
approved these changes
Oct 6, 2022
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
…ionalrole Signed-off-by: Tianli Feng <ftianli@amazon.com> # Conflicts: # CHANGELOG.md
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
The test failure In build 4158
|
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
…ionalrole Signed-off-by: Tianli Feng <ftianli@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
test failure in 4198
The test failure is tracked in issue #4238, but the fix is not backported to 2.x branch after Lucene upgraded to 9.4.0 in 2.x branch. |
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
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
enhancement
Enhancement or improvement to existing feature or request
v2.4.0
'Issues and PRs related to version v2.4.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 #4582 / commit ff2d5be to
2.x
branchThe original code is introduced by commit ea31483 / PR #2424, where node role 'master' is deprecated, and the alternative role 'cluster_manager' is added.
The location for loading the deprecated
master
role in the workaround is not suitable.Changes:
master
role from the methodsetAdditionalRoles()
(which used to load roles defined by plugins) to a new dedicated methodsetDeprecatedMasterRole()
.setAdditionalRoles()
by removing my recent change.Issues Resolved
#4579
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.