tsunghanjacktsai commented on code in PR #4798: URL: https://github.com/apache/rocketmq/pull/4798#discussion_r941942077
########## tools/src/main/java/org/apache/rocketmq/tools/command/controller/ReElectMasterSubCommand.java: ########## @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.rocketmq.tools.command.controller; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.Options; +import org.apache.rocketmq.common.protocol.body.BrokerMemberGroup; +import org.apache.rocketmq.common.protocol.header.namesrv.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.RPCHook; +import org.apache.rocketmq.tools.admin.DefaultMQAdminExt; +import org.apache.rocketmq.tools.command.SubCommand; +import org.apache.rocketmq.tools.command.SubCommandException; + +public class ReElectMasterSubCommand implements SubCommand { + + @Override + public String commandName() { + return "electMaster"; + } + + @Override + public String commandDesc() { + return "Re-elect the specified broker as master"; + } + + @Override + public Options buildCommandlineOptions(Options options) { + Option opt = new Option("a", "controllerAddress", true, "The address of controller"); + opt.setRequired(true); + options.addOption(opt); + + opt = new Option("b", "brokerAddress", true, "which address of the broker wants to be master"); Review Comment: > which address of the broker wants to be master to: > The address of the broker which requires to become master ########## tools/src/main/java/org/apache/rocketmq/tools/command/controller/ReElectMasterSubCommand.java: ########## @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.rocketmq.tools.command.controller; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.Options; +import org.apache.rocketmq.common.protocol.body.BrokerMemberGroup; +import org.apache.rocketmq.common.protocol.header.namesrv.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.RPCHook; +import org.apache.rocketmq.tools.admin.DefaultMQAdminExt; +import org.apache.rocketmq.tools.command.SubCommand; +import org.apache.rocketmq.tools.command.SubCommandException; + +public class ReElectMasterSubCommand implements SubCommand { + + @Override + public String commandName() { + return "electMaster"; + } + + @Override + public String commandDesc() { + return "Re-elect the specified broker as master"; + } + + @Override + public Options buildCommandlineOptions(Options options) { + Option opt = new Option("a", "controllerAddress", true, "The address of controller"); + opt.setRequired(true); + options.addOption(opt); + + opt = new Option("b", "brokerAddress", true, "which address of the broker wants to be master"); + opt.setRequired(true); + options.addOption(opt); + + opt = new Option("n", "brokerName", true, "The broker name of the replicas want to operate"); Review Comment: > The broker name of the replicas want to operate to: > The broker name of the replicas that require to be manipulated ########## controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java: ########## @@ -160,25 +162,35 @@ public ControllerResult<ElectMasterResponseHeader> electMaster( // First, check whether the master is still active final String oldMaster = syncStateInfo.getMasterAddress(); if (StringUtils.isNoneEmpty(oldMaster) && brokerAlivePredicate.test(brokerInfo.getClusterName(), oldMaster)) { - String err = String.format("The old master %s is still alive, not need to elect new master for broker %s", oldMaster, brokerInfo.getBrokerName()); - log.warn("{}", err); - result.setCodeAndRemark(ResponseCode.CONTROLLER_INVALID_REQUEST, err); - return result; + + if (StringUtils.isBlank(assignBrokerAddress)) { + String err = String.format("The old master %s is still alive, not need to elect new master for broker %s", oldMaster, brokerInfo.getBrokerName()); + log.warn("{}", err); + result.setCodeAndRemark(ResponseCode.CONTROLLER_INVALID_REQUEST, err); + return result; + } + + if (StringUtils.equals(oldMaster, assignBrokerAddress)) { + String err = String.format("The Re-elect master the same as old master %s and old master is still alive, not need to elect new master for broker %s", oldMaster, brokerInfo.getBrokerName()); Review Comment: > The Re-elect master the same as old master %s and old master is still alive, not need to elect new master for broker %s to: > The Re-elect master is the same as the old master %s which is still alive, no need to elect new master for broker %s ########## controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java: ########## @@ -160,25 +161,30 @@ public ControllerResult<ElectMasterResponseHeader> electMaster( // First, check whether the master is still active final String oldMaster = syncStateInfo.getMasterAddress(); if (StringUtils.isNoneEmpty(oldMaster) && brokerAlivePredicate.test(brokerInfo.getClusterName(), oldMaster)) { - String err = String.format("The old master %s is still alive, not need to elect new master for broker %s", oldMaster, brokerInfo.getBrokerName()); - log.warn("{}", err); - result.setCodeAndRemark(ResponseCode.CONTROLLER_INVALID_REQUEST, err); - return result; + + if (StringUtils.isBlank(assignBrokerAddress) || StringUtils.equals(oldMaster, assignBrokerAddress)) { + String err = String.format("The old master %s is still alive, not need to elect new master for broker %s", oldMaster, brokerInfo.getBrokerName()); Review Comment: > The old master %s is still alive, not need to elect new master for broker %s to: > The old master %s is still alive, no need to elect new master for broker %s -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
