You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ol...@apache.org on 2023/01/10 06:49:15 UTC
[rocketmq] branch develop updated: [ISSUE #5816] fix the issue that No response is returned when no parameter is configured for the brokerStatus command.(#5818) (#5818)
This is an automated email from the ASF dual-hosted git repository.
oliverwqcwrw pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 589433291 [ISSUE #5816] fix the issue that No response is returned when no parameter is configured for the brokerStatus command.(#5818) (#5818)
589433291 is described below
commit 5894332918e7158d6ff4cc35b126a1b82a1f6b0c
Author: BaoCheng Wang <12...@qq.com>
AuthorDate: Tue Jan 10 14:49:03 2023 +0800
[ISSUE #5816] fix the issue that No response is returned when no parameter is configured for the brokerStatus command.(#5818) (#5818)
Co-authored-by: w30003204 <wa...@huawei.com>
---
.../rocketmq/tools/command/broker/BrokerStatusSubCommand.java | 11 +++++++----
.../tools/command/broker/BrokerStatusSubCommandTest.java | 3 +--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/broker/BrokerStatusSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/broker/BrokerStatusSubCommand.java
index e4085bd6f..830ff3425 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/broker/BrokerStatusSubCommand.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/broker/BrokerStatusSubCommand.java
@@ -22,6 +22,7 @@ import java.util.Set;
import java.util.TreeMap;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.rocketmq.client.exception.MQBrokerException;
import org.apache.rocketmq.remoting.RPCHook;
@@ -48,13 +49,15 @@ public class BrokerStatusSubCommand implements SubCommand {
@Override
public Options buildCommandlineOptions(Options options) {
+ OptionGroup optionGroup = new OptionGroup();
Option opt = new Option("b", "brokerAddr", true, "Broker address");
- opt.setRequired(false);
- options.addOption(opt);
+ optionGroup.addOption(opt);
opt = new Option("c", "clusterName", true, "which cluster");
- opt.setRequired(false);
- options.addOption(opt);
+ optionGroup.addOption(opt);
+
+ optionGroup.setRequired(true);
+ options.addOptionGroup(optionGroup);
return options;
}
diff --git a/tools/src/test/java/org/apache/rocketmq/tools/command/broker/BrokerStatusSubCommandTest.java b/tools/src/test/java/org/apache/rocketmq/tools/command/broker/BrokerStatusSubCommandTest.java
index d329fb093..c685a069a 100644
--- a/tools/src/test/java/org/apache/rocketmq/tools/command/broker/BrokerStatusSubCommandTest.java
+++ b/tools/src/test/java/org/apache/rocketmq/tools/command/broker/BrokerStatusSubCommandTest.java
@@ -39,7 +39,7 @@ public class BrokerStatusSubCommandTest extends ServerResponseMocker {
public void testExecute() throws SubCommandException {
BrokerStatusSubCommand cmd = new BrokerStatusSubCommand();
Options options = ServerUtil.buildCommandlineOptions(new Options());
- String[] subargs = new String[] {"-b 127.0.0.1:" + listenPort(), "-c default-cluster"};
+ String[] subargs = new String[] {"-b 127.0.0.1:" + listenPort()};
final CommandLine commandLine =
ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
cmd.buildCommandlineOptions(options), new DefaultParser());
@@ -47,5 +47,4 @@ public class BrokerStatusSubCommandTest extends ServerResponseMocker {
cmd.execute(commandLine, options, null);
}
-
}