HDDS-15146. Remove getDatanodeInfo(DatanodeDetails) from NodeManager.#10169
Open
szetszwo wants to merge 6 commits intoapache:masterfrom
Open
HDDS-15146. Remove getDatanodeInfo(DatanodeDetails) from NodeManager.#10169szetszwo wants to merge 6 commits intoapache:masterfrom
szetszwo wants to merge 6 commits intoapache:masterfrom
Conversation
Comment on lines
435
to
+438
| public DatanodeInfo getDatanodeInfo(DatanodeDetails dd) { | ||
| if (dd instanceof DatanodeInfo) { | ||
| return (DatanodeInfo) dd; | ||
| } |
Contributor
There was a problem hiding this comment.
This is method is public but only used by MockNodeManager.
| for (DatanodeDetails node : scm.getScmNodeManager().getNodes(opState, state)) { | ||
| NodeStatus ns = scm.getScmNodeManager().getNodeStatus(node); | ||
| DatanodeInfo datanodeInfo = scm.getScmNodeManager().getDatanodeInfo(node); | ||
| DatanodeInfo datanodeInfo = node instanceof DatanodeInfo ? (DatanodeInfo) node : null; |
Contributor
There was a problem hiding this comment.
why do we need instanceof check here, we already know that getNodes returns DatanodeInfo?
| List<Node> filteredScmNodes = scmNodes.stream() | ||
| .filter(n -> deadNodesOnRecon.contains( | ||
| DatanodeDetails.getFromProtoBuf(n.getNodeID()))) | ||
| .filter(n -> deadNodesOnRecon.contains(n.getNodeID().getUuid())) |
Contributor
There was a problem hiding this comment.
n.getNodeID().getUuid() reads the deprecated string uuid field
instead we could use something like
.filter(n -> deadNodesOnRecon.contains(DatanodeID.fromProto(n.getNodeID().getId()).getID()))
This file contains hidden or 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
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.
What changes were proposed in this pull request?
In SCMNodeManager, the underlying DatanodeDetails object actually is already a DatanodeInfo.
What is the link to the Apache JIRA
HDDS-15146
How was this patch tested?
Updating existing tests.