Merge pull request #1471 from RongtongJin/apache_develop

[ISSUE #1464] Fix the issue that master node route info was lost when the node joined the group in dledger mode

broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java

@@ -857,12 +857,9 @@ public class BrokerController {
         if (!messageStoreConfig.isEnableDLegerCommitLog()) {
             startProcessorByHa(messageStoreConfig.getBrokerRole());
             handleSlaveSynchronize(messageStoreConfig.getBrokerRole());
+            this.registerBrokerAll(true, false, true);
         }
 
-
-
-        this.registerBrokerAll(true, false, true);
-
         this.scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
 
             @Override

broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java

@@ -178,6 +178,10 @@ public class BrokerStartup {
                     break;
             }
 
+            if (messageStoreConfig.isEnableDLegerCommitLog()) {
+                brokerConfig.setBrokerId(-1);
+            }
+
             messageStoreConfig.setHaListenPort(nettyServerConfig.getListenPort() + 1);
             LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
             JoranConfigurator configurator = new JoranConfigurator();