HDDS-10510. Improve user experience with containerbalancer CLI

sarvekshayr · Mar 25, 2024 · ff78f9a · ff78f9a
1 parent 91af26a
commit ff78f9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...s/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStopSubcommand.java b/...s/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStopSubcommand.java
@@ -34,6 +34,7 @@
 public class ContainerBalancerStopSubcommand extends ScmSubcommand {
   @Override
   public void execute(ScmClient scmClient) throws IOException {
+    System.out.println("ContainerBalancer is in stopping state. Waiting for current iteration to finish");
     scmClient.stopContainerBalancer();
     System.out.println("Stopping ContainerBalancer...");
   }

diff --git a/...rc/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java b/...rc/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
@@ -104,7 +104,9 @@ public void testContainerBalancerStopSubcommand() throws IOException  {
     ScmClient scmClient = mock(ScmClient.class);
     stopCmd.execute(scmClient);
 
-    Pattern p = Pattern.compile("^Stopping\\sContainerBalancer...");
+    Pattern p = Pattern.compile("^ContainerBalancer\\sis\\sin\\sstopping\\sstate." +
+            "\\sWaiting\\sfor\\scurrent\\siteration\\sto\\sfinish\\n" +
+            "Stopping\\sContainerBalancer...");
     Matcher m = p.matcher(outContent.toString(DEFAULT_ENCODING));
     assertTrue(m.find());
   }