HDDS-11367. Improve ozone balancing status command output

hadoop-hdds/interface-admin/src/main/proto/ScmAdminProtocol.proto

@@ -627,19 +627,20 @@ message ContainerBalancerStatusInfo {
 message ContainerBalancerTaskIterationStatusInfo {
   optional int32 iterationNumber = 1;
   optional string iterationResult = 2;
-  optional int64 sizeScheduledForMoveGB = 3;
-  optional int64 dataSizeMovedGB = 4;
+  optional int64 sizeScheduledForMove = 3;
+  optional int64 dataSizeMoved = 4;
   optional int64 containerMovesScheduled = 5;
   optional int64 containerMovesCompleted = 6;
   optional int64 containerMovesFailed = 7;
   optional int64 containerMovesTimeout = 8;
-  repeated NodeTransferInfo sizeEnteringNodesGB = 9;
-  repeated NodeTransferInfo sizeLeavingNodesGB = 10;
+  repeated NodeTransferInfo sizeEnteringNodes = 9;
+  repeated NodeTransferInfo sizeLeavingNodes = 10;
+  optional int64 iterationDuration = 11;
 }
 
 message NodeTransferInfo {
   optional string uuid = 1;
-  optional int64 dataVolumeGB = 2;
+  optional int64 dataVolume = 2;
 }
 
 message DecommissionScmRequestProto {

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

@@ -40,6 +40,9 @@ public final class ContainerBalancerMetrics {
       " in the latest iteration.")
   private MutableCounterLong dataSizeMovedGBInLatestIteration;
 
+  @Metric(about = "Amount of bytes that Container Balancer moved in the latest iteration.")
+  private MutableCounterLong dataSizeMovedBytesInLatestIteration;
+
   @Metric(about = "Number of completed container moves performed by " +
       "Container Balancer in the latest iteration.")
   private MutableCounterLong numContainerMovesCompletedInLatestIteration;
@@ -131,14 +134,16 @@ void incrementNumContainerMovesScheduledInLatestIteration(long valueToAdd) {
     this.numContainerMovesScheduledInLatestIteration.incr(valueToAdd);
   }
 
+  /**
+   * Reset number of containers scheduled to move in last iteration.
+   */
   public void resetNumContainerMovesScheduledInLatestIteration() {
     numContainerMovesScheduledInLatestIteration.incr(
             -getNumContainerMovesScheduledInLatestIteration());
   }
 
   /**
-   * Gets the amount of data moved by Container Balancer in the latest
-   * iteration.
+   * Gets the amount of data moved by Container Balancer in the latest iteration.
    * @return size in GB
    */
   public long getDataSizeMovedGBInLatestIteration() {
@@ -154,6 +159,29 @@ public void resetDataSizeMovedGBInLatestIteration() {
         -getDataSizeMovedGBInLatestIteration());
   }
 
+  /**
+   * Gets the amount of data moved by Container Balancer in the latest iteration.
+   * @return size in bytes
+   */
+  public long getDataSizeMovedInLatestIteration() {
+    return dataSizeMovedBytesInLatestIteration.value();
+  }
+
+  /**
+   * Increment data size moved in the last iteration.
+   * @param bytes bytes to add
+   */
+  public void incrementDataSizeMovedInLatestIteration(long bytes) {
+    this.dataSizeMovedBytesInLatestIteration.incr(bytes);
+  }
+
+  /**
+   * Reset data size moved in the last iteration.
+   */
+  public void resetDataSizeMovedInLatestIteration() {
+    dataSizeMovedBytesInLatestIteration.incr(-getDataSizeMovedInLatestIteration());
+  }
+
   /**
    * Gets the number of container moves performed by Container Balancer in the
    * latest iteration.
@@ -163,11 +191,6 @@ public long getNumContainerMovesCompletedInLatestIteration() {
     return numContainerMovesCompletedInLatestIteration.value();
   }
 
-  public void incrementNumContainerMovesCompletedInLatestIteration(
-      long valueToAdd) {
-    this.numContainerMovesCompletedInLatestIteration.incr(valueToAdd);
-  }
-
   public void incrementCurrentIterationContainerMoveMetric(
       MoveManager.MoveResult result, long valueToAdd) {
     if (result == null) {
@@ -204,9 +227,11 @@ public void incrementCurrentIterationContainerMoveMetric(
     }
   }
 
+  /**
+   * Moved containers in the last iteration.
+   */
   public void resetNumContainerMovesCompletedInLatestIteration() {
-    numContainerMovesCompletedInLatestIteration.incr(
-        -getNumContainerMovesCompletedInLatestIteration());
+    numContainerMovesCompletedInLatestIteration.incr(-getNumContainerMovesCompletedInLatestIteration());
   }
 
   /**
@@ -218,14 +243,19 @@ public long getNumContainerMovesTimeoutInLatestIteration() {
     return numContainerMovesTimeoutInLatestIteration.value();
   }
 
+  /**
+   * Increment number timeouted container moves.
+   */
   public void incrementNumContainerMovesTimeoutInLatestIteration(
       long valueToAdd) {
     this.numContainerMovesTimeoutInLatestIteration.incr(valueToAdd);
   }
 
+  /**
+   * Reset number timeouted container moves.
+   */
   public void resetNumContainerMovesTimeoutInLatestIteration() {
-    numContainerMovesTimeoutInLatestIteration.incr(
-        -getNumContainerMovesTimeoutInLatestIteration());
+    numContainerMovesTimeoutInLatestIteration.incr(-getNumContainerMovesTimeoutInLatestIteration());
   }
 
   /**

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

@@ -19,9 +19,11 @@
 package org.apache.hadoop.hdds.scm.container.balancer;
 
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos;
 
 import java.time.OffsetDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Info about balancer status.
@@ -51,4 +53,21 @@ public HddsProtos.ContainerBalancerConfigurationProto  getConfiguration() {
   public List<ContainerBalancerTaskIterationStatusInfo> getIterationsStatusInfo() {
     return iterationsStatusInfo;
   }
+
+  /**
+   * Converts an instance into the protobuf compatible object.
+   * @return proto representation
+   */
+  public StorageContainerLocationProtocolProtos.ContainerBalancerStatusInfo toProto() {
+    return StorageContainerLocationProtocolProtos.ContainerBalancerStatusInfo
+        .newBuilder()
+        .setStartedAt(getStartedAt().toEpochSecond())
+        .setConfiguration(getConfiguration())
+        .addAllIterationsStatusInfo(
+            getIterationsStatusInfo()
+                .stream()
+                .map(ContainerBalancerTaskIterationStatusInfo::toProto)
+                .collect(Collectors.toList())
+        ).build();
+  }
 }