adoroszlai commented on code in PR #4209:
URL: https://github.com/apache/ozone/pull/4209#discussion_r1088754590
##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeUsageInfo.java:
##########
@@ -180,11 +180,13 @@ public int hashCode() {
*
* @return Protobuf HddsProtos.DatanodeUsageInfo
*/
- public DatanodeUsageInfoProto toProto(int clientVersion) {
- return toProtoBuilder(clientVersion).build();
+ public DatanodeUsageInfoProto toProto(int clientVersion,
+ long containerCount) {
+ return toProtoBuilder(clientVersion, containerCount).build();
}
- private DatanodeUsageInfoProto.Builder toProtoBuilder(int clientVersion) {
+ private DatanodeUsageInfoProto.Builder toProtoBuilder(int clientVersion,
+ long containerCount) {
Review Comment:
Instead of adding `containerCount` as a parameter to these methods, please
add it to the `DatanodeUsageInfo` class.
##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java:
##########
@@ -1103,11 +1104,24 @@ public List<HddsProtos.DatanodeUsageInfoProto>
getDatanodeUsageInfo(
// return count number of DatanodeUsageInfoProto
return datanodeUsageInfoList.stream()
- .map(each -> each.toProto(clientVersion))
+ .map(each -> each.toProto(clientVersion,
+ getContainerCount(each.getDatanodeDetails())))
.limit(count)
.collect(Collectors.toList());
}
+ private long getContainerCount(DatanodeDetails datanodeDetails) {
+ long containerCount = -1;
+ try {
+ Set<ContainerID> containers = scm.getScmNodeManager()
+ .getContainers(datanodeDetails);
+ containerCount = containers.size();
+ } catch (NodeNotFoundException e) {
+ LOG.error("Node not found, error: ", e);
+ }
+ return containerCount;
+ }
Review Comment:
Countainer count should be set on `DatanodeUsageInfo` by `SCMNodeManager`.
It does not belong to the protocol server.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
