You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by vo...@apache.org on 2022/04/01 00:58:45 UTC
[rocketmq] branch develop updated: [ISSUE #4035] rename some commands (#4036)
This is an automated email from the ASF dual-hosted git repository.
vongosling 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 3369390 [ISSUE #4035] rename some commands (#4036)
3369390 is described below
commit 336939080ef3f57460e958bcebecb5fcac85757c
Author: yuz10 <84...@qq.com>
AuthorDate: Fri Apr 1 08:58:27 2022 +0800
[ISSUE #4035] rename some commands (#4036)
* rename some commands
* update doc
---
docs/cn/acl/user_guide.md | 4 ++--
.../org/apache/rocketmq/tools/command/MQAdminStartup.java | 13 +++++++------
.../java/org/apache/rocketmq/tools/command/SubCommand.java | 4 ++++
.../tools/command/acl/DeleteAccessConfigSubCommand.java | 5 +++++
.../tools/command/acl/GetAccessConfigSubCommand.java | 4 ++++
.../tools/command/message/QueryMsgTraceByIdSubCommand.java | 7 ++++++-
6 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/docs/cn/acl/user_guide.md b/docs/cn/acl/user_guide.md
index 4ee03ba..3835191 100644
--- a/docs/cn/acl/user_guide.md
+++ b/docs/cn/acl/user_guide.md
@@ -155,7 +155,7 @@ sh mqadmin clusterAclConfigVersion -n 192.168.1.2:9876 -c DefaultCluster
### 7.5 查询集群/Broker的ACL配置文件全部内容
该命令的示例如下：
-sh mqadmin getAccessConfigSubCommand -n 192.168.1.2:9876 -c DefaultCluster
+sh mqadmin getAclConfig -n 192.168.1.2:9876 -c DefaultCluster
说明：如果指定的是集群名称，则会在集群中各个broker节点执行该命令；否则会在单个broker节点执行该命令。
@@ -166,4 +166,4 @@ sh mqadmin getAccessConfigSubCommand -n 192.168.1.2:9876 -c DefaultCluster
| b | eg:192.168.12.134:10911 | 指定broker地址(与集群名称二选一) |
**特别注意**开启Acl鉴权认证后导致Master/Slave和Dledger模式下Broker同步数据异常的问题，
-在社区[4.5.1]版本中已经修复，具体的PR链接为：https://github.com/apache/rocketmq/pull/1149；
\ No newline at end of file
+在社区[4.5.1]版本中已经修复，具体的PR链接为：https://github.com/apache/rocketmq/pull/1149；
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
index b506abe..046ed5d 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
@@ -19,8 +19,6 @@ package org.apache.rocketmq.tools.command;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.joran.JoranConfigurator;
import ch.qos.logback.core.joran.spi.JoranException;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser;
@@ -31,8 +29,8 @@ import org.apache.rocketmq.remoting.RPCHook;
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
import org.apache.rocketmq.srvutil.ServerUtil;
import org.apache.rocketmq.tools.command.acl.ClusterAclConfigVersionListSubCommand;
-import org.apache.rocketmq.tools.command.acl.GetAccessConfigSubCommand;
import org.apache.rocketmq.tools.command.acl.DeleteAccessConfigSubCommand;
+import org.apache.rocketmq.tools.command.acl.GetAccessConfigSubCommand;
import org.apache.rocketmq.tools.command.acl.UpdateAccessConfigSubCommand;
import org.apache.rocketmq.tools.command.acl.UpdateGlobalWhiteAddrSubCommand;
import org.apache.rocketmq.tools.command.broker.BrokerConsumeStatsSubCommad;
@@ -52,8 +50,9 @@ import org.apache.rocketmq.tools.command.consumer.DeleteSubscriptionGroupCommand
import org.apache.rocketmq.tools.command.consumer.GetConsumerConfigSubCommand;
import org.apache.rocketmq.tools.command.consumer.StartMonitoringSubCommand;
import org.apache.rocketmq.tools.command.consumer.UpdateSubGroupSubCommand;
-import org.apache.rocketmq.tools.command.export.ExportMetricsCommand;
import org.apache.rocketmq.tools.command.export.ExportConfigsCommand;
+import org.apache.rocketmq.tools.command.export.ExportMetadataCommand;
+import org.apache.rocketmq.tools.command.export.ExportMetricsCommand;
import org.apache.rocketmq.tools.command.message.CheckMsgSendRTCommand;
import org.apache.rocketmq.tools.command.message.ConsumeMessageCommand;
import org.apache.rocketmq.tools.command.message.PrintMessageByQueueCommand;
@@ -77,7 +76,6 @@ import org.apache.rocketmq.tools.command.queue.QueryConsumeQueueCommand;
import org.apache.rocketmq.tools.command.stats.StatsAllSubCommand;
import org.apache.rocketmq.tools.command.topic.AllocateMQSubCommand;
import org.apache.rocketmq.tools.command.topic.DeleteTopicSubCommand;
-import org.apache.rocketmq.tools.command.export.ExportMetadataCommand;
import org.apache.rocketmq.tools.command.topic.TopicClusterSubCommand;
import org.apache.rocketmq.tools.command.topic.TopicListSubCommand;
import org.apache.rocketmq.tools.command.topic.TopicRouteSubCommand;
@@ -87,6 +85,9 @@ import org.apache.rocketmq.tools.command.topic.UpdateTopicPermSubCommand;
import org.apache.rocketmq.tools.command.topic.UpdateTopicSubCommand;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.List;
+
public class MQAdminStartup {
protected static List<SubCommand> subCommandList = new ArrayList<SubCommand>();
@@ -247,7 +248,7 @@ public class MQAdminStartup {
private static SubCommand findSubCommand(final String name) {
for (SubCommand cmd : subCommandList) {
- if (cmd.commandName().toUpperCase().equals(name.toUpperCase())) {
+ if (cmd.commandName().equalsIgnoreCase(name) || (cmd.commandAlias() != null && cmd.commandAlias().equalsIgnoreCase(name))) {
return cmd;
}
}
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/SubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/SubCommand.java
index b42db08..3ed2a92 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/SubCommand.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/SubCommand.java
@@ -23,6 +23,10 @@ import org.apache.rocketmq.remoting.RPCHook;
public interface SubCommand {
String commandName();
+ default String commandAlias() {
+ return null;
+ }
+
String commandDesc();
Options buildCommandlineOptions(final Options options);
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommand.java
index 4e7cd93..1eddcff 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommand.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommand.java
@@ -32,6 +32,11 @@ public class DeleteAccessConfigSubCommand implements SubCommand {
@Override
public String commandName() {
+ return "deleteAclConfig";
+ }
+
+ @Override
+ public String commandAlias() {
return "deleteAccessConfig";
}
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/acl/GetAccessConfigSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/acl/GetAccessConfigSubCommand.java
index 90638c1..483d136 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/acl/GetAccessConfigSubCommand.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/acl/GetAccessConfigSubCommand.java
@@ -38,6 +38,10 @@ import java.util.Set;
public class GetAccessConfigSubCommand implements SubCommand {
@Override public String commandName() {
+ return "getAclConfig";
+ }
+
+ @Override public String commandAlias() {
return "getAccessConfigSubCommand";
}
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/message/QueryMsgTraceByIdSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/message/QueryMsgTraceByIdSubCommand.java
index 7382ff5..5496a37 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/message/QueryMsgTraceByIdSubCommand.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/message/QueryMsgTraceByIdSubCommand.java
@@ -58,6 +58,11 @@ public class QueryMsgTraceByIdSubCommand implements SubCommand {
@Override
public String commandName() {
+ return "queryMsgTraceById";
+ }
+
+ @Override
+ public String commandAlias() {
return "QueryMsgTraceById";
}
@@ -151,4 +156,4 @@ public class QueryMsgTraceByIdSubCommand implements SubCommand {
System.out.printf("\n");
}
}
-}
\ No newline at end of file
+}