[ISSUE #6926] Fixing the error in the initialization order of replica…

…sManager caused the controller mode to fail to start.
apache · Jun 23, 2023 · 82492a6 · 82492a6
1 parent 4e09a9c
commit 82492a6
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -761,9 +761,6 @@ public boolean initializeMessageStore() {
                 messageStoreConfig, brokerStatsManager, messageArrivingListener, brokerConfig, configuration);
             this.messageStore = MessageStoreFactory.build(context, defaultMessageStore);
             this.messageStore.getDispatcherList().addFirst(new CommitLogDispatcherCalcBitMap(this.brokerConfig, this.consumerFilterManager));
-            if (this.brokerConfig.isEnableControllerMode()) {
-                this.replicasManager = new ReplicasManager(this);
-            }
             if (messageStoreConfig.isTimerWheelEnable()) {
                 this.timerCheckpoint = new TimerCheckpoint(BrokerPathConfigHelper.getTimerCheckPath(messageStoreConfig.getStorePathRootDir()));
                 TimerMetrics timerMetrics = new TimerMetrics(BrokerPathConfigHelper.getTimerMetricsPath(messageStoreConfig.getStorePathRootDir()));
@@ -785,11 +782,6 @@ public boolean initialize() throws CloneNotSupportedException {
             return false;
         }
 
-        if (this.brokerConfig.isEnableControllerMode()) {
-            this.replicasManager.setFenced(true);
-        }
-
-
         result = this.initializeMessageStore();
         if (!result) {
             return false;
@@ -802,6 +794,11 @@ public boolean recoverAndInitService() throws CloneNotSupportedException {
 
         boolean result = true;
 
+        if (this.brokerConfig.isEnableControllerMode()) {
+            this.replicasManager = new ReplicasManager(this);
+            this.replicasManager.setFenced(true);
+        }
+
         if (messageStore != null) {
             registerMessageStoreHook();
             result = this.messageStore.load();