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,10 @@ 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 dataSizeMovedInLatestIteration;
+
   @Metric(about = "Number of completed container moves performed by " +
       "Container Balancer in the latest iteration.")
   private MutableCounterLong numContainerMovesCompletedInLatestIteration;
@@ -154,6 +158,24 @@ 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 dataSizeMovedInLatestIteration.value();
+  }
+
+  public void incrementDataSizeMovedInLatestIteration(long valueToAdd) {
+    this.dataSizeMovedInLatestIteration.incr(valueToAdd);
+  }
+
+  public void resetDataSizeMovedInLatestIteration() {
+    dataSizeMovedInLatestIteration.incr(
+        -getDataSizeMovedInLatestIteration());
+  }
+
   /**
    * Gets the number of container moves performed by Container Balancer in the
    * latest iteration.

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

@@ -43,6 +43,7 @@
 
 import java.io.IOException;
 import java.time.Duration;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -60,6 +61,7 @@
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
+import static java.time.OffsetDateTime.now;
 import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_NODE_REPORT_INTERVAL;
 import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_NODE_REPORT_INTERVAL_DEFAULT;
 
@@ -118,7 +120,7 @@ public class ContainerBalancerTask implements Runnable {
   private int nextIterationIndex;
   private boolean delayStart;
   private List<ContainerBalancerTaskIterationStatusInfo> iterationsStatistic;
-
+  private OffsetDateTime currentIterationStarted;
   /**
    * Constructs ContainerBalancerTask with the specified arguments.
    *
@@ -207,6 +209,7 @@ private void balance() {
     // leader change or restart
     int i = nextIterationIndex;
     for (; i < iterations && isBalancerRunning(); i++) {
+      currentIterationStarted = now();
       // reset some variables and metrics for this iteration
       resetState();
       if (config.getTriggerDuEnable()) {
@@ -302,8 +305,9 @@ private void saveIterationStatistic(Integer iterationNumber, IterationResult iR)
     ContainerBalancerTaskIterationStatusInfo iterationStatistic = new ContainerBalancerTaskIterationStatusInfo(
             iterationNumber,
             iR.name(),
-            getSizeScheduledForMoveInLatestIteration() / OzoneConsts.GB,
-            metrics.getDataSizeMovedGBInLatestIteration(),
+        now().toEpochSecond() - currentIterationStarted.toEpochSecond(),
+            getSizeScheduledForMoveInLatestIteration(),
+            metrics.getDataSizeMovedInLatestIteration(),
             metrics.getNumContainerMovesScheduledInLatestIteration(),
             metrics.getNumContainerMovesCompletedInLatestIteration(),
             metrics.getNumContainerMovesFailedInLatestIteration(),
@@ -316,7 +320,7 @@ private void saveIterationStatistic(Integer iterationNumber, IterationResult iR)
                     .collect(
                             Collectors.toMap(
                                     entry -> entry.getKey().getUuid(),
-                                    entry -> entry.getValue() / OzoneConsts.GB
+                                Map.Entry::getValue
                             )
                     ),
             findSourceStrategy.getSizeLeavingNodes()
@@ -327,7 +331,7 @@ private void saveIterationStatistic(Integer iterationNumber, IterationResult iR)
                     .collect(
                             Collectors.toMap(
                                     entry -> entry.getKey().getUuid(),
-                                    entry -> entry.getValue() / OzoneConsts.GB
+                                    entry -> entry.getValue()
                             )
                     )
     );
@@ -340,12 +344,13 @@ public List<ContainerBalancerTaskIterationStatusInfo> getCurrentIterationsStatis
         .mapToInt(ContainerBalancerTaskIterationStatusInfo::getIterationNumber)
         .max()
         .orElse(0);
-
+    long iterationDuration = getCurrentIterationDuration();
     ContainerBalancerTaskIterationStatusInfo currentIterationStatistic = new ContainerBalancerTaskIterationStatusInfo(
         lastIterationNumber + 1,
         null,
-        getSizeScheduledForMoveInLatestIteration() / OzoneConsts.GB,
-        sizeActuallyMovedInLatestIteration / OzoneConsts.GB,
+        iterationDuration,
+        getSizeScheduledForMoveInLatestIteration(),
+        sizeActuallyMovedInLatestIteration,
         metrics.getNumContainerMovesScheduledInLatestIteration(),
         metrics.getNumContainerMovesCompletedInLatestIteration(),
         metrics.getNumContainerMovesFailedInLatestIteration(),
@@ -357,7 +362,7 @@ public List<ContainerBalancerTaskIterationStatusInfo> getCurrentIterationsStatis
             .filter(datanodeDetailsLongEntry -> datanodeDetailsLongEntry.getValue() > 0)
             .collect(Collectors.toMap(
                     entry -> entry.getKey().getUuid(),
-                    entry -> entry.getValue() / OzoneConsts.GB
+                    entry -> entry.getValue()
                 )
             ),
         findSourceStrategy.getSizeLeavingNodes()
@@ -368,7 +373,7 @@ public List<ContainerBalancerTaskIterationStatusInfo> getCurrentIterationsStatis
             .collect(
                 Collectors.toMap(
                     entry -> entry.getKey().getUuid(),
-                    entry -> entry.getValue() / OzoneConsts.GB
+                    entry -> entry.getValue()
                 )
             )
     );
@@ -377,6 +382,14 @@ public List<ContainerBalancerTaskIterationStatusInfo> getCurrentIterationsStatis
     return resultList;
   }
 
+  private long getCurrentIterationDuration() {
+    if (currentIterationStarted == null) {
+      return -1L;
+    } else {
+      return now().toEpochSecond() - currentIterationStarted.toEpochSecond();
+    }
+  }
+
   /**
    * Logs the reason for stop and save configuration and stop the task.
    * 
@@ -719,6 +732,8 @@ private void checkIterationMoveResults() {
         metrics.getNumContainerMovesTimeoutInLatestIteration());
     metrics.incrementDataSizeMovedGBInLatestIteration(
         sizeActuallyMovedInLatestIteration / OzoneConsts.GB);
+    metrics.incrementDataSizeMovedInLatestIteration(
+        sizeActuallyMovedInLatestIteration);
     metrics.incrementDataSizeMovedGB(
         metrics.getDataSizeMovedGBInLatestIteration());
     metrics.incrementNumContainerMovesFailed(
@@ -1145,6 +1160,7 @@ private void resetState() {
     this.sizeScheduledForMoveInLatestIteration = 0;
     this.sizeActuallyMovedInLatestIteration = 0;
     metrics.resetDataSizeMovedGBInLatestIteration();
+    metrics.resetDataSizeMovedInLatestIteration();
     metrics.resetNumContainerMovesScheduledInLatestIteration();
     metrics.resetNumContainerMovesCompletedInLatestIteration();
     metrics.resetNumContainerMovesTimeoutInLatestIteration();

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

@@ -27,37 +27,40 @@
 public class ContainerBalancerTaskIterationStatusInfo {
   private final Integer iterationNumber;
   private final String iterationResult;
-  private final long sizeScheduledForMoveGB;
-  private final long dataSizeMovedGB;
+  private final long iterationDuration;
+  private final long sizeScheduledForMove;
+  private final long dataSizeMoved;
   private final long containerMovesScheduled;
   private final long containerMovesCompleted;
   private final long containerMovesFailed;
   private final long containerMovesTimeout;
-  private final Map<UUID, Long> sizeEnteringNodesGB;
-  private final Map<UUID, Long> sizeLeavingNodesGB;
+  private final Map<UUID, Long> sizeEnteringNodes;
+  private final Map<UUID, Long> sizeLeavingNodes;
 
   @SuppressWarnings("checkstyle:ParameterNumber")
   public ContainerBalancerTaskIterationStatusInfo(
       Integer iterationNumber,
       String iterationResult,
-      long sizeScheduledForMoveGB,
-      long dataSizeMovedGB,
+      long iterationDuration,
+      long sizeScheduledForMove,
+      long dataSizeMoved,
       long containerMovesScheduled,
       long containerMovesCompleted,
       long containerMovesFailed,
       long containerMovesTimeout,
-      Map<UUID, Long> sizeEnteringNodesGB,
-      Map<UUID, Long> sizeLeavingNodesGB) {
+      Map<UUID, Long> sizeEnteringNodes,
+      Map<UUID, Long> sizeLeavingNodes) {
     this.iterationNumber = iterationNumber;
     this.iterationResult = iterationResult;
-    this.sizeScheduledForMoveGB = sizeScheduledForMoveGB;
-    this.dataSizeMovedGB = dataSizeMovedGB;
+    this.iterationDuration = iterationDuration;
+    this.sizeScheduledForMove = sizeScheduledForMove;
+    this.dataSizeMoved = dataSizeMoved;
     this.containerMovesScheduled = containerMovesScheduled;
     this.containerMovesCompleted = containerMovesCompleted;
     this.containerMovesFailed = containerMovesFailed;
     this.containerMovesTimeout = containerMovesTimeout;
-    this.sizeEnteringNodesGB = sizeEnteringNodesGB;
-    this.sizeLeavingNodesGB = sizeLeavingNodesGB;
+    this.sizeEnteringNodes = sizeEnteringNodes;
+    this.sizeLeavingNodes = sizeLeavingNodes;
   }
 
   public Integer getIterationNumber() {
@@ -68,12 +71,12 @@ public String getIterationResult() {
     return iterationResult;
   }
 
-  public long getSizeScheduledForMoveGB() {
-    return sizeScheduledForMoveGB;
+  public long getSizeScheduledForMove() {
+    return sizeScheduledForMove;
   }
 
-  public long getDataSizeMovedGB() {
-    return dataSizeMovedGB;
+  public long getDataSizeMoved() {
+    return dataSizeMoved;
   }
 
   public long getContainerMovesScheduled() {
@@ -92,12 +95,16 @@ public long getContainerMovesTimeout() {
     return containerMovesTimeout;
   }
 
-  public Map<UUID, Long> getSizeEnteringNodesGB() {
-    return sizeEnteringNodesGB;
+  public Map<UUID, Long> getSizeEnteringNodes() {
+    return sizeEnteringNodes;
   }
 
-  public Map<UUID, Long> getSizeLeavingNodesGB() {
-    return sizeLeavingNodesGB;
+  public Map<UUID, Long> getSizeLeavingNodes() {
+    return sizeLeavingNodes;
+  }
+
+  public long getIterationDuration() {
+    return iterationDuration;
   }
 }
 

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java

@@ -1237,28 +1237,29 @@ public ContainerBalancerStatusInfoResponseProto getContainerBalancerStatusInfo()
                           info -> ContainerBalancerTaskIterationStatusInfo.newBuilder()
                               .setIterationNumber(info.getIterationNumber())
                               .setIterationResult(Optional.ofNullable(info.getIterationResult()).orElse(""))
-                              .setSizeScheduledForMoveGB(info.getSizeScheduledForMoveGB())
-                              .setDataSizeMovedGB(info.getDataSizeMovedGB())
+                              .setIterationDuration(info.getIterationDuration())
+                              .setSizeScheduledForMove(info.getSizeScheduledForMove())
+                              .setDataSizeMoved(info.getDataSizeMoved())
                               .setContainerMovesScheduled(info.getContainerMovesScheduled())
                               .setContainerMovesCompleted(info.getContainerMovesCompleted())
                               .setContainerMovesFailed(info.getContainerMovesFailed())
                               .setContainerMovesTimeout(info.getContainerMovesTimeout())
-                              .addAllSizeEnteringNodesGB(
-                                  info.getSizeEnteringNodesGB().entrySet()
+                              .addAllSizeEnteringNodes(
+                                  info.getSizeEnteringNodes().entrySet()
                                       .stream()
                                       .map(entry -> NodeTransferInfo.newBuilder()
                                           .setUuid(entry.getKey().toString())
-                                          .setDataVolumeGB(entry.getValue())
+                                          .setDataVolume(entry.getValue())
                                           .build()
                                       )
                                       .collect(Collectors.toList())
                               )
-                              .addAllSizeLeavingNodesGB(
-                                  info.getSizeLeavingNodesGB().entrySet()
+                              .addAllSizeLeavingNodes(
+                                  info.getSizeLeavingNodes().entrySet()
                                       .stream()
                                       .map(entry -> NodeTransferInfo.newBuilder()
                                           .setUuid(entry.getKey().toString())
-                                          .setDataVolumeGB(entry.getValue())
+                                          .setDataVolume(entry.getValue())
                                           .build()
                                       )
                                       .collect(Collectors.toList())

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerStatusInfo.java

@@ -50,8 +50,8 @@ void testGetIterationStatistics() {
       assertTrue(is.getContainerMovesCompleted() > 0);
       assertEquals(0, is.getContainerMovesFailed());
       assertEquals(0, is.getContainerMovesTimeout());
-      assertFalse(is.getSizeEnteringNodesGB().isEmpty());
-      assertFalse(is.getSizeLeavingNodesGB().isEmpty());
+      assertFalse(is.getSizeEnteringNodes().isEmpty());
+      assertFalse(is.getSizeLeavingNodes().isEmpty());
     });
 
   }