You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2022/06/02 14:22:05 UTC
[rocketmq] branch 5.0.0-beta-dledger-controller updated: Remove useless remotingClient in ControllerManager
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 addd307e0 Remove useless remotingClient in ControllerManager
addd307e0 is described below
commit addd307e01286033b24c6bbd8d44042345426d57
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Thu Jun 2 22:21:50 2022 +0800
Remove useless remotingClient in ControllerManager
---
.../java/org/apache/rocketmq/controller/ControllerManager.java | 8 --------
.../org/apache/rocketmq/controller/impl/DLedgerController.java | 4 ++--
...rollerStateMachine.java => DLedgerControllerStateMachine.java} | 4 ++--
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/controller/src/main/java/org/apache/rocketmq/controller/ControllerManager.java b/controller/src/main/java/org/apache/rocketmq/controller/ControllerManager.java
index 4bd97f876..2a3a6b578 100644
--- a/controller/src/main/java/org/apache/rocketmq/controller/ControllerManager.java
+++ b/controller/src/main/java/org/apache/rocketmq/controller/ControllerManager.java
@@ -16,7 +16,6 @@
*/
package org.apache.rocketmq.controller;
-import java.util.Collections;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
@@ -37,11 +36,8 @@ import org.apache.rocketmq.controller.impl.DefaultBrokerHeartbeatManager;
import org.apache.rocketmq.controller.processor.ControllerRequestProcessor;
import org.apache.rocketmq.logging.InternalLogger;
import org.apache.rocketmq.logging.InternalLoggerFactory;
-import org.apache.rocketmq.remoting.RemotingClient;
import org.apache.rocketmq.remoting.RemotingServer;
-import org.apache.rocketmq.remoting.common.RemotingUtil;
import org.apache.rocketmq.remoting.netty.NettyClientConfig;
-import org.apache.rocketmq.remoting.netty.NettyRemotingClient;
import org.apache.rocketmq.remoting.netty.NettyRemotingServer;
import org.apache.rocketmq.remoting.netty.NettyServerConfig;
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
@@ -56,7 +52,6 @@ public class ControllerManager {
private final Configuration configuration;
private Controller controller;
private BrokerHeartbeatManager heartbeatManager;
- private RemotingClient remotingClient;
private RemotingServer remotingServer;
private ExecutorService controllerRequestExecutor;
@@ -90,8 +85,6 @@ public class ControllerManager {
}
};
this.remotingServer = new NettyRemotingServer(this.nettyServerConfig, this.brokerHousekeepingService);
- this.remotingClient = new NettyRemotingClient(this.nettyClientConfig);
- this.remotingClient.updateNameServerAddressList(Collections.singletonList(RemotingUtil.getLocalAddress() + ":" + this.nettyServerConfig.getListenPort()));
this.heartbeatManager = new DefaultBrokerHeartbeatManager(this.controllerConfig);
this.controller = new DLedgerController(this.controllerConfig, (cluster, brokerAddr) -> this.heartbeatManager.isBrokerActive(cluster, brokerAddr));
@@ -128,7 +121,6 @@ public class ControllerManager {
public void start() {
this.remotingServer.start();
- this.remotingClient.start();
this.heartbeatManager.start();
this.controller.startup();
}
diff --git a/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerController.java b/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerController.java
index 055b3009f..ce20ffcfe 100644
--- a/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerController.java
+++ b/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerController.java
@@ -70,7 +70,7 @@ public class DLedgerController implements Controller {
private final EventScheduler scheduler;
private final EventSerializer eventSerializer;
private final RoleChangeHandler roleHandler;
- private final DledgerControllerStateMachine statemachine;
+ private final DLedgerControllerStateMachine statemachine;
private volatile boolean isScheduling = false;
public DLedgerController(final ControllerConfig config, final BiPredicate<String, String> brokerAlivePredicate) {
@@ -88,7 +88,7 @@ public class DLedgerController implements Controller {
this.roleHandler = new RoleChangeHandler(dLedgerConfig.getSelfId());
this.replicasInfoManager = new ReplicasInfoManager(config);
- this.statemachine = new DledgerControllerStateMachine(replicasInfoManager, this.eventSerializer, dLedgerConfig.getSelfId());
+ this.statemachine = new DLedgerControllerStateMachine(replicasInfoManager, this.eventSerializer, dLedgerConfig.getSelfId());
// Register statemachine and role handler.
this.dLedgerServer = new DLedgerServer(dLedgerConfig);
diff --git a/controller/src/main/java/org/apache/rocketmq/controller/impl/DledgerControllerStateMachine.java b/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerControllerStateMachine.java
similarity index 95%
rename from controller/src/main/java/org/apache/rocketmq/controller/impl/DledgerControllerStateMachine.java
rename to controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerControllerStateMachine.java
index 54e93c5f2..4cfe3c5bd 100644
--- a/controller/src/main/java/org/apache/rocketmq/controller/impl/DledgerControllerStateMachine.java
+++ b/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerControllerStateMachine.java
@@ -32,13 +32,13 @@ import org.apache.rocketmq.logging.InternalLoggerFactory;
/**
* The state machine implementation of the dledger controller
*/
-public class DledgerControllerStateMachine implements StateMachine {
+public class DLedgerControllerStateMachine implements StateMachine {
private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.CONTROLLER_LOGGER_NAME);
private final ReplicasInfoManager replicasInfoManager;
private final EventSerializer eventSerializer;
private final String dledgerId;
- public DledgerControllerStateMachine(final ReplicasInfoManager replicasInfoManager,
+ public DLedgerControllerStateMachine(final ReplicasInfoManager replicasInfoManager,
final EventSerializer eventSerializer, final String dledgerId) {
this.replicasInfoManager = replicasInfoManager;
this.eventSerializer = eventSerializer;