fuyou001 commented on code in PR #7301: URL: https://github.com/apache/rocketmq/pull/7301#discussion_r1335845115
########## controller/src/main/java/org/apache/rocketmq/controller/impl/JRaftController.java: ########## @@ -0,0 +1,280 @@ +/* + * 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.controller.impl; + +import com.alipay.sofa.jraft.Node; +import com.alipay.sofa.jraft.RaftGroupService; +import com.alipay.sofa.jraft.Status; +import com.alipay.sofa.jraft.conf.Configuration; +import com.alipay.sofa.jraft.entity.NodeId; +import com.alipay.sofa.jraft.entity.PeerId; +import com.alipay.sofa.jraft.entity.Task; +import com.alipay.sofa.jraft.option.NodeOptions; +import org.apache.commons.io.FileUtils; +import org.apache.rocketmq.common.ControllerConfig; +import org.apache.rocketmq.common.constant.LoggerName; +import org.apache.rocketmq.controller.Controller; +import org.apache.rocketmq.controller.helper.BrokerLifecycleListener; +import org.apache.rocketmq.controller.impl.closure.ControllerClosure; +import org.apache.rocketmq.controller.impl.task.BrokerCloseChannelRequest; +import org.apache.rocketmq.controller.impl.task.CheckNotActiveBrokerRequest; +import org.apache.rocketmq.controller.impl.task.GetBrokerLiveInfoRequest; +import org.apache.rocketmq.controller.impl.task.GetSyncStateDataRequest; +import org.apache.rocketmq.controller.impl.task.RaftBrokerHeartBeatEventRequest; +import org.apache.rocketmq.remoting.ChannelEventListener; +import org.apache.rocketmq.remoting.CommandCustomHeader; +import org.apache.rocketmq.remoting.RemotingServer; +import org.apache.rocketmq.remoting.netty.NettyRemotingServer; +import org.apache.rocketmq.remoting.netty.NettyServerConfig; +import org.apache.rocketmq.remoting.protocol.RemotingCommand; +import org.apache.rocketmq.remoting.protocol.RemotingSerializable; +import org.apache.rocketmq.remoting.protocol.RequestCode; +import org.apache.rocketmq.remoting.protocol.ResponseCode; +import org.apache.rocketmq.remoting.protocol.body.SyncStateSet; +import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.admin.CleanControllerBrokerDataRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.register.ApplyBrokerIdRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.register.GetNextBrokerIdRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.register.RegisterBrokerToControllerRequestHeader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; + +public class JRaftController implements Controller { + private static final Logger log = LoggerFactory.getLogger(LoggerName.CONTROLLER_LOGGER_NAME); + private final RaftGroupService raftGroupService; + private final Node node; + private final JRaftControllerStateMachine stateMachine; + private final ControllerConfig controllerConfig; + private final List<BrokerLifecycleListener> brokerLifecycleListeners; + private final Map<PeerId/* jRaft peerId */, String/* Controller RPC Server Addr */> peerIdToAddr; + private final NettyRemotingServer remotingServer; + + public JRaftController(ControllerConfig controllerConfig, + final ChannelEventListener channelEventListener) throws IOException { + this.controllerConfig = controllerConfig; + this.brokerLifecycleListeners = new ArrayList<>(); + + final NodeOptions nodeOptions = new NodeOptions(); + nodeOptions.setElectionTimeoutMs(controllerConfig.getjRaftElectionTimeoutMs()); + nodeOptions.setSnapshotIntervalSecs(controllerConfig.getjRaftSnapshotIntervalSecs()); + final PeerId serverId = new PeerId(); + if (!serverId.parse(controllerConfig.getjRaftServerId())) { + throw new IllegalArgumentException("Fail to parse serverId:" + controllerConfig.getjRaftServerId()); + } + final Configuration initConf = new Configuration(); + if (!initConf.parse(controllerConfig.getjRaftInitConf())) { + throw new IllegalArgumentException("Fail to parse initConf:" + controllerConfig.getjRaftInitConf()); + } + nodeOptions.setInitialConf(initConf); + + FileUtils.forceMkdir(new File(controllerConfig.getControllerStorePath())); + nodeOptions.setLogUri(controllerConfig.getControllerStorePath() + File.separator + "log"); + nodeOptions.setRaftMetaUri(controllerConfig.getControllerStorePath() + File.separator + "raft_meta"); + nodeOptions.setSnapshotUri(controllerConfig.getControllerStorePath() + File.separator + "snapshot"); + + this.stateMachine = new JRaftControllerStateMachine(controllerConfig, new NodeId(controllerConfig.getjRaftGroupId(), serverId)); + this.stateMachine.registerOnLeaderStart(this::onLeaderStart); + this.stateMachine.registerOnLeaderStop(this::onLeaderStop); + nodeOptions.setFsm(this.stateMachine); + + this.raftGroupService = new RaftGroupService(controllerConfig.getjRaftGroupId(), serverId, nodeOptions); + + this.peerIdToAddr = new HashMap<>(); + initPeerIdMap(); + + NettyServerConfig nettyServerConfig = new NettyServerConfig(); + nettyServerConfig.setListenPort(Integer.parseInt(this.peerIdToAddr.get(serverId).split(":")[1])); + remotingServer = new NettyRemotingServer(nettyServerConfig, channelEventListener); + + this.node = this.raftGroupService.start(); + } + + private void initPeerIdMap() { + String[] peers = this.controllerConfig.getjRaftInitConf().split(","); + String[] rpcAddrs = this.controllerConfig.getjRaftControllerRPCAddr().split(","); + for (int i = 0; i < peers.length; i++) { + PeerId peerId = new PeerId(); + if (!peerId.parse(peers[i])) { + throw new IllegalArgumentException("Fail to parse peerId:" + peers[i]); + } + this.peerIdToAddr.put(peerId, rpcAddrs[i]); + } + } + + @Override + public void startup() { + this.remotingServer.start(); + log.info("Controller {} started.", node.getNodeId()); + } + + @Override + public void shutdown() { + this.stopScheduling(); + this.raftGroupService.shutdown(); + this.remotingServer.shutdown(); + log.info("Controller {} stopped.", node.getNodeId()); + } + + @Override + public void startScheduling() { + } + + @Override + public void stopScheduling() { + } + + @Override + public boolean isLeaderState() { + return node.isLeader(); + } + + private <T extends CommandCustomHeader> CompletableFuture<RemotingCommand> applyToJRaft(RemotingCommand request) { + if (!isLeaderState()) { + final RemotingCommand command = RemotingCommand.createResponseCommand(ResponseCode.CONTROLLER_NOT_LEADER, "The controller is not in leader state"); + final CompletableFuture<RemotingCommand> future = new CompletableFuture<>(); + future.complete(command); + log.warn("Apply to none leader controller, controller state is {}", node.getNodeState()); + return future; + } + ControllerClosure closure = new ControllerClosure(request); + Task task = closure.taskWithThisClosure(); + if (task != null) { Review Comment: @yulangz 我初看了JRaft CounterService Demo，这个Demo和你提的PR还是不一样，Demo 中相关数据变更都在CounterStateMachine中，而你提的PR在processEvent处理业务业务逻辑（数据变更）、ControllerClosure#run返回结果，这二个操作并非原子，存在并发风险。 至于你反馈测试正常，并发问题发生概率本身就比较低，不一定可以测出。 建议你针对PR，再看看，这二个操作要保证原子 。 ########## controller/src/main/java/org/apache/rocketmq/controller/impl/JRaftController.java: ########## @@ -0,0 +1,280 @@ +/* + * 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.controller.impl; + +import com.alipay.sofa.jraft.Node; +import com.alipay.sofa.jraft.RaftGroupService; +import com.alipay.sofa.jraft.Status; +import com.alipay.sofa.jraft.conf.Configuration; +import com.alipay.sofa.jraft.entity.NodeId; +import com.alipay.sofa.jraft.entity.PeerId; +import com.alipay.sofa.jraft.entity.Task; +import com.alipay.sofa.jraft.option.NodeOptions; +import org.apache.commons.io.FileUtils; +import org.apache.rocketmq.common.ControllerConfig; +import org.apache.rocketmq.common.constant.LoggerName; +import org.apache.rocketmq.controller.Controller; +import org.apache.rocketmq.controller.helper.BrokerLifecycleListener; +import org.apache.rocketmq.controller.impl.closure.ControllerClosure; +import org.apache.rocketmq.controller.impl.task.BrokerCloseChannelRequest; +import org.apache.rocketmq.controller.impl.task.CheckNotActiveBrokerRequest; +import org.apache.rocketmq.controller.impl.task.GetBrokerLiveInfoRequest; +import org.apache.rocketmq.controller.impl.task.GetSyncStateDataRequest; +import org.apache.rocketmq.controller.impl.task.RaftBrokerHeartBeatEventRequest; +import org.apache.rocketmq.remoting.ChannelEventListener; +import org.apache.rocketmq.remoting.CommandCustomHeader; +import org.apache.rocketmq.remoting.RemotingServer; +import org.apache.rocketmq.remoting.netty.NettyRemotingServer; +import org.apache.rocketmq.remoting.netty.NettyServerConfig; +import org.apache.rocketmq.remoting.protocol.RemotingCommand; +import org.apache.rocketmq.remoting.protocol.RemotingSerializable; +import org.apache.rocketmq.remoting.protocol.RequestCode; +import org.apache.rocketmq.remoting.protocol.ResponseCode; +import org.apache.rocketmq.remoting.protocol.body.SyncStateSet; +import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.admin.CleanControllerBrokerDataRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.register.ApplyBrokerIdRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.register.GetNextBrokerIdRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.register.RegisterBrokerToControllerRequestHeader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; + +public class JRaftController implements Controller { + private static final Logger log = LoggerFactory.getLogger(LoggerName.CONTROLLER_LOGGER_NAME); + private final RaftGroupService raftGroupService; + private final Node node; + private final JRaftControllerStateMachine stateMachine; + private final ControllerConfig controllerConfig; + private final List<BrokerLifecycleListener> brokerLifecycleListeners; + private final Map<PeerId/* jRaft peerId */, String/* Controller RPC Server Addr */> peerIdToAddr; + private final NettyRemotingServer remotingServer; + + public JRaftController(ControllerConfig controllerConfig, + final ChannelEventListener channelEventListener) throws IOException { + this.controllerConfig = controllerConfig; + this.brokerLifecycleListeners = new ArrayList<>(); + + final NodeOptions nodeOptions = new NodeOptions(); + nodeOptions.setElectionTimeoutMs(controllerConfig.getjRaftElectionTimeoutMs()); + nodeOptions.setSnapshotIntervalSecs(controllerConfig.getjRaftSnapshotIntervalSecs()); + final PeerId serverId = new PeerId(); + if (!serverId.parse(controllerConfig.getjRaftServerId())) { + throw new IllegalArgumentException("Fail to parse serverId:" + controllerConfig.getjRaftServerId()); + } + final Configuration initConf = new Configuration(); + if (!initConf.parse(controllerConfig.getjRaftInitConf())) { + throw new IllegalArgumentException("Fail to parse initConf:" + controllerConfig.getjRaftInitConf()); + } + nodeOptions.setInitialConf(initConf); + + FileUtils.forceMkdir(new File(controllerConfig.getControllerStorePath())); + nodeOptions.setLogUri(controllerConfig.getControllerStorePath() + File.separator + "log"); + nodeOptions.setRaftMetaUri(controllerConfig.getControllerStorePath() + File.separator + "raft_meta"); + nodeOptions.setSnapshotUri(controllerConfig.getControllerStorePath() + File.separator + "snapshot"); + + this.stateMachine = new JRaftControllerStateMachine(controllerConfig, new NodeId(controllerConfig.getjRaftGroupId(), serverId)); + this.stateMachine.registerOnLeaderStart(this::onLeaderStart); + this.stateMachine.registerOnLeaderStop(this::onLeaderStop); + nodeOptions.setFsm(this.stateMachine); + + this.raftGroupService = new RaftGroupService(controllerConfig.getjRaftGroupId(), serverId, nodeOptions); + + this.peerIdToAddr = new HashMap<>(); + initPeerIdMap(); + + NettyServerConfig nettyServerConfig = new NettyServerConfig(); + nettyServerConfig.setListenPort(Integer.parseInt(this.peerIdToAddr.get(serverId).split(":")[1])); + remotingServer = new NettyRemotingServer(nettyServerConfig, channelEventListener); + + this.node = this.raftGroupService.start(); + } + + private void initPeerIdMap() { + String[] peers = this.controllerConfig.getjRaftInitConf().split(","); + String[] rpcAddrs = this.controllerConfig.getjRaftControllerRPCAddr().split(","); + for (int i = 0; i < peers.length; i++) { + PeerId peerId = new PeerId(); + if (!peerId.parse(peers[i])) { + throw new IllegalArgumentException("Fail to parse peerId:" + peers[i]); + } + this.peerIdToAddr.put(peerId, rpcAddrs[i]); + } + } + + @Override + public void startup() { + this.remotingServer.start(); + log.info("Controller {} started.", node.getNodeId()); + } + + @Override + public void shutdown() { + this.stopScheduling(); + this.raftGroupService.shutdown(); + this.remotingServer.shutdown(); + log.info("Controller {} stopped.", node.getNodeId()); + } + + @Override + public void startScheduling() { + } + + @Override + public void stopScheduling() { + } + + @Override + public boolean isLeaderState() { + return node.isLeader(); + } + + private <T extends CommandCustomHeader> CompletableFuture<RemotingCommand> applyToJRaft(RemotingCommand request) { + if (!isLeaderState()) { + final RemotingCommand command = RemotingCommand.createResponseCommand(ResponseCode.CONTROLLER_NOT_LEADER, "The controller is not in leader state"); + final CompletableFuture<RemotingCommand> future = new CompletableFuture<>(); + future.complete(command); + log.warn("Apply to none leader controller, controller state is {}", node.getNodeState()); + return future; + } + ControllerClosure closure = new ControllerClosure(request); + Task task = closure.taskWithThisClosure(); + if (task != null) { Review Comment: @yulangz 我初看了JRaft CounterService Demo，这个Demo和你提的PR还是不一样，Demo 中相关数据变更都在CounterStateMachine中，而你提的PR在processEvent处理业务业务逻辑（数据变更）、ControllerClosure#run返回结果，这二个操作并非原子，存在并发风险。 至于你反馈测试正常，并发问题发生概率本身就比较低，不一定可以测出。 建议你针对PR，再看看，这二个操作要保证原子 。 -- 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: commits-unsubscr...@rocketmq.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
