This is an automated email from the ASF dual-hosted git repository.
ljain pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new b439802 HDDS-6417 - Fix console output message when container
balancer does not start (#3164)
b439802 is described below
commit b439802f5dfd72f3b03a6ea78622dfced2e083cc
Author: nilotpalnandi <[email protected]>
AuthorDate: Mon Mar 7 14:16:22 2022 +0530
HDDS-6417 - Fix console output message when container balancer does not
start (#3164)
---
.../hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java | 4 ++--
.../hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
index 73d8511..d7ec0b2 100644
---
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
+++
b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
@@ -79,7 +79,7 @@ public class ContainerBalancerStartSubcommand extends
ScmSubcommand {
System.out.println("Container Balancer started successfully.");
return;
}
- System.out.println("Container Balancer is already running. " +
- "Please stop it first.");
+ System.out.println("Container Balancer is either already running or " +
+ "failed to start.\nPlease check the logs for more info.");
}
}
\ No newline at end of file
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
index a7ef779..8ce07ec 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
@@ -134,8 +134,10 @@ public class TestContainerBalancerSubCommand {
.thenAnswer(invocation -> false);
startCmd.execute(scmClient);
- Pattern p = Pattern.compile("^Container\\sBalancer\\sis\\salready" +
- "\\srunning.\\sPlease\\sstop\\sit\\sfirst.");
+ Pattern p = Pattern.compile("^Container\\sBalancer\\sis\\seither" +
+ "\\salready\\srunning\\sor\\sfailed\\sto\\sstart.\\nPlease\\scheck" +
+ "\\sthe\\slogs\\sfor\\smore\\sinfo.");
+
Matcher m = p.matcher(outContent.toString(DEFAULT_ENCODING));
assertTrue(m.find());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
