HDDS-6362. Add aggregate metrics to ContainerBalancerMetrics

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java

@@ -508,7 +508,7 @@ private void checkIterationMoveResults(Set<DatanodeDetails> selectedTargets) {
             ContainerInfo container =
                 containerManager.getContainer(moveSelection.getContainerID());
             this.sizeMovedPerIteration += container.getUsedBytes();
-            metrics.incrementNumMovedContainersInLatestIteration(1);
+            metrics.incrementNumContainerMovesInLatestIteration(1);
             LOG.info("Container move completed for container {} to target {}",
                 container.containerID(),
                 moveSelection.getTargetNode().getUuidString());
@@ -541,10 +541,13 @@ private void checkIterationMoveResults(Set<DatanodeDetails> selectedTargets) {
         sourceToTargetMap.size() + selectedTargets.size();
     metrics.incrementNumDatanodesInvolvedInLatestIteration(
         countDatanodesInvolvedPerIteration);
-    metrics.incrementDataSizeMovedGBInLatestIteration(
-        sizeMovedPerIteration / OzoneConsts.GB);
+    sizeMovedPerIteration /= OzoneConsts.GB;
+    metrics.incrementDataSizeMovedGBInLatestIteration(sizeMovedPerIteration);
+    metrics.incrementNumContainerMoves(
+        metrics.getNumContainerMovesInLatestIteration());
+    metrics.incrementDataSizeMovedGB(sizeMovedPerIteration);
     LOG.info("Number of datanodes involved in this iteration: {}. Size moved " +
-            "in this iteration: {}B.",
+            "in this iteration: {}GB.",
         countDatanodesInvolvedPerIteration, sizeMovedPerIteration);
   }
 
@@ -814,7 +817,7 @@ private void resetState() {
     this.countDatanodesInvolvedPerIteration = 0;
     this.sizeMovedPerIteration = 0;
     metrics.resetDataSizeMovedGBInLatestIteration();
-    metrics.resetNumMovedContainersInLatestIteration();
+    metrics.resetNumContainerMovesInLatestIteration();
     metrics.resetNumDatanodesInvolvedInLatestIteration();
     metrics.resetDataSizeUnbalancedGB();
     metrics.resetNumDatanodesUnbalanced();

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerMetrics.java

@@ -40,9 +40,9 @@ public final class ContainerBalancerMetrics {
       " in the latest iteration.")
   private MutableCounterLong dataSizeMovedGBInLatestIteration;
 
-  @Metric(about = "Number of containers that Container Balancer moved" +
-      " in the latest iteration.")
-  private MutableCounterLong numMovedContainersInLatestIteration;
+  @Metric(about = "Number of container moves performed by Container Balancer " +
+      "in the latest iteration.")
+  private MutableCounterLong numContainerMovesInLatestIteration;
 
   @Metric(about = "Number of iterations that Container Balancer has run for.")
   private MutableCounterLong numIterations;
@@ -57,6 +57,14 @@ public final class ContainerBalancerMetrics {
   @Metric(about = "Number of unbalanced datanodes.")
   private MutableCounterLong numDatanodesUnbalanced;
 
+  @Metric(about = "Total number of container moves across all iterations of " +
+      "Container Balancer.")
+  private MutableCounterLong numContainerMoves;
+
+  @Metric(about = "Total data size in GB moved across all iterations of " +
+      "Container Balancer.")
+  private MutableCounterLong dataSizeMovedGB;
+
   /**
    * Create and register metrics named {@link ContainerBalancerMetrics#NAME}
    * for {@link ContainerBalancer}.
@@ -92,21 +100,21 @@ public void resetDataSizeMovedGBInLatestIteration() {
   }
 
   /**
-   * Gets the number of containers moved by Container Balancer in the latest
-   * iteration.
-   * @return number of containers
+   * Gets the number of container moves performed by Container Balancer in the
+   * latest iteration.
+   * @return number of container moves
    */
-  public long getNumMovedContainersInLatestIteration() {
-    return numMovedContainersInLatestIteration.value();
+  public long getNumContainerMovesInLatestIteration() {
+    return numContainerMovesInLatestIteration.value();
   }
 
-  public void incrementNumMovedContainersInLatestIteration(long valueToAdd) {
-    this.numMovedContainersInLatestIteration.incr(valueToAdd);
+  public void incrementNumContainerMovesInLatestIteration(long valueToAdd) {
+    this.numContainerMovesInLatestIteration.incr(valueToAdd);
   }
 
-  public void resetNumMovedContainersInLatestIteration() {
-    numMovedContainersInLatestIteration.incr(
-        -getNumMovedContainersInLatestIteration());
+  public void resetNumContainerMovesInLatestIteration() {
+    numContainerMovesInLatestIteration.incr(
+        -getNumContainerMovesInLatestIteration());
   }
 
   /**
@@ -170,4 +178,20 @@ public void incrementNumDatanodesUnbalanced(long valueToAdd) {
   public void resetNumDatanodesUnbalanced() {
     numDatanodesUnbalanced.incr(-getNumDatanodesUnbalanced());
   }
+
+  public long getNumContainerMoves() {
+    return numContainerMoves.value();
+  }
+
+  public void incrementNumContainerMoves(long valueToAdd) {
+    numContainerMoves.incr(valueToAdd);
+  }
+
+  public long getDataSizeMovedGB() {
+    return dataSizeMovedGB.value();
+  }
+
+  public void incrementDataSizeMovedGB(long valueToAdd) {
+    dataSizeMovedGB.incr(valueToAdd);
+  }
 }