This is an automated email from the ASF dual-hosted git repository. jinrongtong pushed a commit to branch dledger-controller-brokerId in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 2a08193626a8aeb7031358e0b5d3ba5cc6d48634 Author: TheR1sing3un <[email protected]> AuthorDate: Mon Feb 6 11:36:21 2023 +0800 feat(broker): fix some bugs to successfully compile project 1. fix some bugs to successfully compile project --- .../rocketmq/controller/impl/controller/ControllerManagerTest.java | 1 - .../java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java | 4 ++-- .../java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java | 4 ++-- tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java | 4 ++-- .../rocketmq/tools/command/controller/ReElectMasterSubCommand.java | 6 +++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java index 49c56f06b..762d169d9 100644 --- a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java +++ b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java @@ -114,7 +114,6 @@ public class ControllerManagerTest { } return null; }, item -> item != null); - System.out.println("leader born!!!!!"); return manager; } diff --git a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java index f70580dc6..ce0c7a8a5 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java @@ -833,8 +833,8 @@ public class DefaultMQAdminExt extends ClientConfig implements MQAdminExt { @Override public ElectMasterResponseHeader electMaster(String controllerAddr, String clusterName, - String brokerName, String brokerAddr) throws RemotingException, InterruptedException, MQBrokerException { - return this.defaultMQAdminExtImpl.electMaster(controllerAddr, clusterName, brokerName, brokerAddr); + String brokerName, Long brokerId) throws RemotingException, InterruptedException, MQBrokerException { + return this.defaultMQAdminExtImpl.electMaster(controllerAddr, clusterName, brokerName, brokerId); } @Override diff --git a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java index fc3e079fe..ac4b51c59 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java @@ -1844,8 +1844,8 @@ public class DefaultMQAdminExtImpl implements MQAdminExt, MQAdminExtInner { @Override public ElectMasterResponseHeader electMaster(String controllerAddr, String clusterName, - String brokerName, String brokerAddr) throws RemotingException, InterruptedException, MQBrokerException { - return this.mqClientInstance.getMQClientAPIImpl().electMaster(controllerAddr, clusterName, brokerName, brokerAddr); + String brokerName, Long brokerId) throws RemotingException, InterruptedException, MQBrokerException { + return this.mqClientInstance.getMQClientAPIImpl().electMaster(controllerAddr, clusterName, brokerName, brokerId); } @Override diff --git a/tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java b/tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java index 2d19af5f2..e8cb3e1f8 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java @@ -455,14 +455,14 @@ public interface MQAdminExt extends MQAdmin { * @param controllerAddr controller address * @param clusterName cluster name * @param brokerName broker name - * @param brokerAddr broker address + * @param brokerId broker id * @return * @throws RemotingException * @throws InterruptedException * @throws MQBrokerException */ ElectMasterResponseHeader electMaster(String controllerAddr, String clusterName, String brokerName, - String brokerAddr) throws RemotingException, InterruptedException, MQBrokerException; + Long brokerId) throws RemotingException, InterruptedException, MQBrokerException; /** * clean controller broker meta data diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/controller/ReElectMasterSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/controller/ReElectMasterSubCommand.java index 6c1777e36..1861754c5 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/controller/ReElectMasterSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/controller/ReElectMasterSubCommand.java @@ -45,7 +45,7 @@ public class ReElectMasterSubCommand implements SubCommand { opt.setRequired(true); options.addOption(opt); - opt = new Option("b", "brokerAddress", true, "The address of the broker which requires to become master"); + opt = new Option("b", "brokerId", true, "The id of the broker which requires to become master"); opt.setRequired(true); options.addOption(opt); @@ -68,11 +68,11 @@ public class ReElectMasterSubCommand implements SubCommand { String controllerAddress = commandLine.getOptionValue("a").trim(); String clusterName = commandLine.getOptionValue('c').trim(); String brokerName = commandLine.getOptionValue('n').trim(); - String brokerAddress = commandLine.getOptionValue("b").trim(); + Long brokerId = Long.valueOf(commandLine.getOptionValue("b").trim()); try { defaultMQAdminExt.start(); - final ElectMasterResponseHeader metaData = defaultMQAdminExt.electMaster(controllerAddress, clusterName, brokerName, brokerAddress); + final ElectMasterResponseHeader metaData = defaultMQAdminExt.electMaster(controllerAddress, clusterName, brokerName, brokerId); System.out.printf("\n#ClusterName\t%s", clusterName); System.out.printf("\n#BrokerName\t%s", brokerName); System.out.printf("\n#BrokerMasterAddr\t%s", metaData.getMasterAddress());
