[rocketmq] branch 5.0.0-beta-dledger-controller updated: Polish the GetSyncStateSetSubCommand

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch 5.0.0-beta-dledger-controller
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/5.0.0-beta-dledger-controller by this push:
     new 9094de9a6 Polish the GetSyncStateSetSubCommand
9094de9a6 is described below

commit 9094de9a64186ce920ed601355739e17e4326dec
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Tue Jun 7 22:32:11 2022 +0800

    Polish the GetSyncStateSetSubCommand
---
 .../main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java | 4 ++--
 .../apache/rocketmq/tools/command/broker/GetBrokerEpochCommand.java | 2 +-
 .../ha/{SyncStateSetCommand.java => GetSyncStateSetSubCommand.java} | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

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 1f537dce4..297f3592f 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
@@ -62,7 +62,7 @@ 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.ha.HAStatusSubCommand;
-import org.apache.rocketmq.tools.command.ha.SyncStateSetCommand;
+import org.apache.rocketmq.tools.command.ha.GetSyncStateSetSubCommand;
 import org.apache.rocketmq.tools.command.message.CheckMsgSendRTCommand;
 import org.apache.rocketmq.tools.command.message.ConsumeMessageCommand;
 import org.apache.rocketmq.tools.command.message.PrintMessageByQueueCommand;
@@ -249,7 +249,7 @@ public class MQAdminStartup {
 
         initCommand(new HAStatusSubCommand());
 
-        initCommand(new SyncStateSetCommand());
+        initCommand(new GetSyncStateSetSubCommand());
         initCommand(new GetBrokerEpochCommand());
         initCommand(new GetControllerMetaDataCommand());
     }
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/broker/GetBrokerEpochCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/broker/GetBrokerEpochCommand.java
index a4be1b9e2..3884015f8 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/broker/GetBrokerEpochCommand.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/broker/GetBrokerEpochCommand.java
@@ -112,7 +112,7 @@ public class GetBrokerEpochCommand implements SubCommand {
                 if (i == epochList.size() - 1) {
                     epochEntry.setEndOffset(epochCache.getMaxOffset());
                 }
-                System.out.printf("\n#Epoch: %s", epochEntry.toString());
+                System.out.printf("\n#Epoch: %s\n", epochEntry.toString());
             }
         }
     }
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/ha/SyncStateSetCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/ha/GetSyncStateSetSubCommand.java
similarity index 97%
rename from tools/src/main/java/org/apache/rocketmq/tools/command/ha/SyncStateSetCommand.java
rename to tools/src/main/java/org/apache/rocketmq/tools/command/ha/GetSyncStateSetSubCommand.java
index 3e1fba6fa..d543c4b8d 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/ha/SyncStateSetCommand.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/ha/GetSyncStateSetSubCommand.java
@@ -31,7 +31,7 @@ import org.apache.rocketmq.tools.command.CommandUtil;
 import org.apache.rocketmq.tools.command.SubCommand;
 import org.apache.rocketmq.tools.command.SubCommandException;
 
-public class SyncStateSetCommand implements SubCommand {
+public class GetSyncStateSetSubCommand implements SubCommand {
     @Override
     public String commandName() {
         return "getSyncStateSet";
@@ -96,7 +96,7 @@ public class SyncStateSetCommand implements SubCommand {
 
     private void innerExec(CommandLine commandLine, Options options,
         DefaultMQAdminExt defaultMQAdminExt) throws Exception {
-        String controllerAddress = commandLine.getOptionValue('a').trim();
+        String controllerAddress = commandLine.getOptionValue('a').trim().split(";")[0];
         if (commandLine.hasOption('b')) {
             String brokerName = commandLine.getOptionValue('b').trim();
             final ArrayList<String> brokers = new ArrayList<>();
@@ -122,7 +122,7 @@ public class SyncStateSetCommand implements SubCommand {
                     next.getKey(), next.getValue().getMasterAddress(), next.getValue().getMasterEpoch(), next.getValue().getSyncStateSetEpoch(),
                     syncMembers.size());
                 for (InSyncStateData.InSyncMember member : syncMembers) {
-                    System.out.printf("\n member:\t%s", member.toString());
+                    System.out.printf("\n member:\t%s\n", member.toString());
                 }
             }
         }