HDDS-11463. Improve Some Code.

Author: slfan1989

hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java

@@ -41,7 +41,8 @@
         TransferScmLeaderSubCommand.class,
         DeletedBlocksTxnCommands.class,
         DecommissionScmSubcommand.class,
-        RotateKeySubCommand.class
+        RotateKeySubCommand.class,
+        VolumeFailureSubCommand.class,
     })
 @MetaInfServices(SubcommandWithParent.class)
 public class ScmAdmin extends GenericCli implements SubcommandWithParent {

hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/VolumeFailureSubCommand.java renamed to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/VolumeFailureSubCommand.java

@@ -15,19 +15,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hdds.scm.cli.datanode;
+package org.apache.hadoop.ozone.admin.scm;
 
 import org.apache.hadoop.hdds.cli.HddsVersionProvider;
 import org.apache.hadoop.hdds.scm.cli.ScmSubcommand;
 import org.apache.hadoop.hdds.scm.client.ScmClient;
 import org.apache.hadoop.hdds.scm.datanode.VolumeFailureInfo;
 import org.apache.hadoop.hdds.server.JsonUtils;
+import org.apache.hadoop.ozone.utils.FormattingCLIUtils;
 import org.apache.hadoop.util.StringUtils;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
@@ -44,17 +46,44 @@ public class VolumeFailureSubCommand extends ScmSubcommand {
        description = "Format output as JSON")
   private boolean json;
 
-  private SimpleDateFormat sdf = new SimpleDateFormat(
+  // Display it in TABLE format.
+  @Option(names = { "--table" },
+       defaultValue = "false",
+       description = "Format output as Table")
+  private boolean table;
+
+  private static final SimpleDateFormat sdf = new SimpleDateFormat(
       "EEE MMM dd HH:mm:ss Z yyyy", Locale.ENGLISH);
-  
+
+  private static final String DATANODE_VOLUME_FAILURES_TITLE = "Datanode Volume Failures";
+
+  private static final List<String>  DATANODE_VOLUME_FAILURES_HEADER = Arrays.asList(
+      "Node", "Volume Name", "Capacity Lost", "Failure Date");
+
   @Override
-  protected void execute(ScmClient client) throws IOException {
+  public void execute(ScmClient client) throws IOException {
     List<VolumeFailureInfo> volumeFailureInfos = client.getVolumeFailureInfos();
+
     if (json) {
       System.out.print(
           JsonUtils.toJsonStringWithDefaultPrettyPrinter(volumeFailureInfos));
       return;
     }
+
+    if(table) {
+      FormattingCLIUtils formattingCLIUtils = new FormattingCLIUtils(DATANODE_VOLUME_FAILURES_TITLE)
+          .addHeaders(DATANODE_VOLUME_FAILURES_HEADER);
+      for (VolumeFailureInfo info : volumeFailureInfos) {
+        String capacityLost = StringUtils.byteDesc(info.getCapacityLost());
+        String failureDate = sdf.format(info.getFailureDate());
+        String[] values = new String[]{info.getNode(), info.getVolumeName(),
+            capacityLost, failureDate};
+        formattingCLIUtils.addLine(values);
+      }
+      System.out.println(formattingCLIUtils.render());
+      return;
+    }
+
     System.out.printf("Datanode Volume Failures (%d Volumes)%n%n", volumeFailureInfos.size());
     volumeFailureInfos.forEach(this::printInfo);
   }

hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestVolumeFailureSubCommand.java renamed to hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestVolumeFailureSubCommand.java

@@ -15,13 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hdds.scm.cli.datanode;
+package org.apache.hadoop.ozone.scm;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.hadoop.hdds.protocol.MockDatanodeDetails;
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.hdds.scm.client.ScmClient;
+import org.apache.hadoop.ozone.admin.scm.VolumeFailureSubCommand;
 import org.apache.hadoop.hdds.scm.datanode.VolumeFailureInfo;
 import org.apache.hadoop.util.Time;
 import org.junit.jupiter.api.AfterEach;
@@ -36,7 +35,11 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
 
+import static org.apache.hadoop.hdds.protocol.DatanodeDetails.Port.Name.ALL_PORTS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -71,6 +74,16 @@ public void testCorrectJsonValuesInReport() throws IOException {
     cmd.execute(scmClient);
   }
 
+  @Test
+  public void testCorrectTableValuesInReport() throws IOException {
+    ScmClient scmClient = mock(ScmClient.class);
+    when(scmClient.getVolumeFailureInfos()).thenAnswer(invocation -> getUsageProto());
+
+    CommandLine c = new CommandLine(cmd);
+    c.parseArgs("--table");
+    cmd.execute(scmClient);
+  }
+
   private List<VolumeFailureInfo> getUsageProto() {
     List<VolumeFailureInfo> result = new ArrayList<>();
     for (int i = 0; i < 5; i++) {
@@ -90,6 +103,23 @@ private List<VolumeFailureInfo> getUsageProto() {
   }
 
   private HddsProtos.DatanodeDetailsProto createDatanodeDetails() {
-    return MockDatanodeDetails.randomDatanodeDetails().getProtoBufMessage();
+    Random random = ThreadLocalRandom.current();
+    String ipAddress = random.nextInt(256)
+            + "." + random.nextInt(256)
+            + "." + random.nextInt(256)
+            + "." + random.nextInt(256);
+
+    DatanodeDetails.Builder dn = DatanodeDetails.newBuilder()
+            .setUuid(UUID.randomUUID())
+            .setHostName("localhost" + "-" + ipAddress)
+            .setIpAddress(ipAddress)
+            .setPersistedOpState(HddsProtos.NodeOperationalState.IN_SERVICE)
+            .setPersistedOpStateExpiry(0);
+
+    for (DatanodeDetails.Port.Name name : ALL_PORTS) {
+      dn.addPort(DatanodeDetails.newPort(name, 0));
+    }
+
+    return dn.build().getProtoBufMessage();
   }
 }