[Backport 2.x] Xcontent fix #2613
Closed
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: Ryan Liang <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: Craig Perkins <[email protected]>
cwperks
requested review from
cliu123,
DarshitChanpura,
davidlago,
peternied,
RyanL1997 and
stephen-crawford
as code owners
peternied
reviewed
Mar 30, 2023
| @@ -308,13 +308,12 @@ public ClusterInfo waitForCluster(final ClusterHealthStatus status, final TimeVa | |||
|
|
|||
| final List<NodeInfo> nodes = res.getNodes(); | |||
|
|
|||
| final List<NodeInfo> clusterManagerNodes = nodes.stream().filter(n->n.getNode().getRoles().contains(DiscoveryNodeRole.CLUSTER_MANAGER_ROLE)).collect(Collectors.toList()); | |||
| final List<NodeInfo> clusterManagerNodes = nodes.stream().filter(n->n.getNode().getRoles().stream().anyMatch(r -> r.roleName().equals("master"))).collect(Collectors.toList()); | |||
There was a problem hiding this comment.
We should not be using the term master in our code anymore, it should be cluster manager or something similar
peternied
requested changes
Mar 30, 2023
There was a problem hiding this comment.
We made a pull request that transitions to cluster manager terminology. We should incorporate that backport into this change instead of using the deprecated terms.
This should be safe to merge even if OpenSearch backs out their change
Seems like this is a breaking change from OpenSearch done in opensearch-project/OpenSearch#6331 @RyanL1997 Can you figure out if that change was accidentally including in 2.x branches - doesn't seem correct.
This was referenced Mar 30, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Reacts to refactoring done on xcontent classes from core. Many imports from org.opensearch.common.xcontent were switched to org.opensearch.core.xcontent.
I needed to change ClusterHelper L311 to
because of this change in core: opensearch-project/OpenSearch#6331
Build fix
Issues Resolved
#2600
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.