opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-08-30 18:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'apache:develop' into develop

Browse Source
This commit is contained in:
sunhangda
2021-07-05 09:48:01 +08:00
committed by GitHub
parent 062e6f33e5 2a6371765e
commit c75ef50ced
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/src/main/java/org/apache/rocketmq/example/benchmark/Consumer.java
+1 -2
View File
@@ -189,8 +189,7 @@ public class Consumer {
opt = new Option("g", "group", true, "Consumer group name, Default: benchmark_consumer");
opt.setRequired(false);
options.addOption(opt);
opt = new Option("p", "group suffix enable", true, "Consumer group suffix enable, Default: false");
opt = new Option("p", "group prefix enable", true, "Is group prefix enable, Default: false");
opt.setRequired(false);
options.addOption(opt);
tools/src/main/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommand.java
+4 -4
View File
@@ -44,10 +44,10 @@ public class DeleteAccessConfigSubCommand implements SubCommand {
public Options buildCommandlineOptions(Options options) {
OptionGroup optionGroup = new OptionGroup();
Option opt = new Option("b", "brokerAddr", true, "delete acl config account to which broker");
Option opt = new Option("b", "brokerAddr", true, "delete acl config account from which broker");
optionGroup.addOption(opt);
opt = new Option("c", "clusterName", true, "delete cl config account to which cluster");
opt = new Option("c", "clusterName", true, "delete acl config account from which cluster");
optionGroup.addOption(opt);
optionGroup.setRequired(true);
@@ -76,7 +76,7 @@ public class DeleteAccessConfigSubCommand implements SubCommand {
defaultMQAdminExt.start();
defaultMQAdminExt.deletePlainAccessConfig(addr, accessKey);
System.out.printf("delete plain access config account to %s success.%n", addr);
System.out.printf("delete plain access config account from %s success.%n", addr);
System.out.printf("account's accesskey is:%s", accessKey);
return;
@@ -89,7 +89,7 @@ public class DeleteAccessConfigSubCommand implements SubCommand {
CommandUtil.fetchMasterAddrByClusterName(defaultMQAdminExt, clusterName);
for (String addr : masterSet) {
defaultMQAdminExt.deletePlainAccessConfig(addr, accessKey);
System.out.printf("delete plain access config account to %s success.%n", addr);
System.out.printf("delete plain access config account from %s success.%n", addr);
}
System.out.printf("account's accesskey is:%s", accessKey);
tools/src/main/java/org/apache/rocketmq/tools/command/acl/UpdateAccessConfigSubCommand.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class UpdateAccessConfigSubCommand implements SubCommand {
Option opt = new Option("b", "brokerAddr", true, "update acl config file to which broker");
optionGroup.addOption(opt);
opt = new Option("c", "clusterName", true, "update cl config file to which cluster");
opt = new Option("c", "clusterName", true, "update acl config file to which cluster");
optionGroup.addOption(opt);
optionGroup.setRequired(true);