address comment

sadanand48 · Dec 11, 2023 · a895195 · a895195
1 parent 0ee64ba
commit a895195
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/...op-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CloseSubcommand.java b/...op-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/container/CloseSubcommand.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 
+import org.apache.hadoop.hdds.cli.GenericParentCommand;
 import org.apache.hadoop.hdds.cli.HddsVersionProvider;
 import org.apache.hadoop.hdds.scm.cli.ScmSubcommand;
 import org.apache.hadoop.hdds.scm.client.ScmClient;
@@ -27,6 +28,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Parameters;
 
@@ -43,6 +45,9 @@ public class CloseSubcommand extends ScmSubcommand {
   private static final Logger LOG =
       LoggerFactory.getLogger(CloseSubcommand.class);
 
+  @CommandLine.Spec
+  private CommandLine.Model.CommandSpec spec;
+
   @Parameters(description = "Id of the container to close")
   private long containerId;
 
@@ -52,7 +57,14 @@ public void execute(ScmClient scmClient) throws IOException {
     try {
       scmClient.closeContainer(containerId);
     } catch (IOException ioe) {
-      LOG.error("Unable to close container", ioe);
+      boolean verbose = spec != null && spec.root()
+          .userObject() instanceof GenericParentCommand &&
+          ((GenericParentCommand) spec.root().userObject()).isVerbose();
+      if (!verbose) {
+        LOG.error("Unable to close container : {}", ioe.getMessage());
+      } else {
+        LOG.error("Unable to close container", ioe);
+      }
     }
   }