siddhantsangwan commented on a change in pull request #2625:
URL: https://github.com/apache/ozone/pull/2625#discussion_r705236024



##########
File path: 
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
##########
@@ -627,23 +633,26 @@ private double 
calculateAvgUtilization(List<DatanodeUsageInfo> nodes) {
     }
     clusterCapacity = aggregatedStats.getCapacity().get();
     clusterUsed = aggregatedStats.getScmUsed().get();
+    clusterRemaining = aggregatedStats.getRemaining().get();
 
-    return clusterUsed / (double) clusterCapacity;
+    return (clusterCapacity - clusterRemaining) / (double) clusterCapacity;
   }
 
   /**
-   * Calculates the utilization, that is used space divided by capacity, for
-   * the given datanodeUsageInfo.
+   * Calculates the utilization, that is (capacity - remaining) divided by
+   * capacity, for the given datanodeUsageInfo.
    *
    * @param datanodeUsageInfo DatanodeUsageInfo to calculate utilization for
    * @return Utilization value
    */
   public static double calculateUtilization(
       DatanodeUsageInfo datanodeUsageInfo) {
     SCMNodeStat stat = datanodeUsageInfo.getScmNodeStat();
+    double capacity = stat.getCapacity().get();
+    double remaining = stat.getRemaining().get();
+    double numerator = capacity - remaining;
 
-    return stat.getScmUsed().get().doubleValue() /
-        stat.getCapacity().get().doubleValue();
+    return numerator / capacity;
   }

Review comment:
       Currently the utilization api uses `compareByRemainingRatio` in 
`SCMNodeStat`. We could instead have a `calculateUtilization` method in the 
`DatanodeUsageInfo` class.




-- 
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]

Reply via email to