[rocketmq] branch develop updated: [ISSUE #5704] Optimize nameserver start when enableControllerInNamesrv of NamesrvConfig is false (#5707)

[jinrongtong]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 98ebcef71 [ISSUE #5704] Optimize nameserver start when 
enableControllerInNamesrv of NamesrvConfig is false (#5707)
98ebcef71 is described below

commit 98ebcef71c09e0157b6ae0b9f245b3de855c134d
Author: mxsm <ljbm...@gmail.com>
AuthorDate: Sun Jan 8 22:06:17 2023 +0800

    [ISSUE #5704] Optimize nameserver start when enableControllerInNamesrv of 
NamesrvConfig is false (#5707)
---
 .../src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java 
b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java
index 63a417536..3f5fbb85e 100644
--- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java
+++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java
@@ -93,7 +93,6 @@ public class NamesrvStartup {
         nettyServerConfig = new NettyServerConfig();
         nettyClientConfig = new NettyClientConfig();
         nettyServerConfig.setListenPort(9876);
-        controllerConfig = new ControllerConfig();
         if (commandLine.hasOption('c')) {
             String file = commandLine.getOptionValue('c');
             if (file != null) {
@@ -103,8 +102,10 @@ public class NamesrvStartup {
                 MixAll.properties2Object(properties, namesrvConfig);
                 MixAll.properties2Object(properties, nettyServerConfig);
                 MixAll.properties2Object(properties, nettyClientConfig);
-                MixAll.properties2Object(properties, controllerConfig);
-
+                if (namesrvConfig.isEnableControllerInNamesrv()) {
+                    controllerConfig = new ControllerConfig();
+                    MixAll.properties2Object(properties, controllerConfig);
+                }
                 namesrvConfig.setConfigStorePath(file);
 
                 System.out.printf("load config properties file OK, %s%n", 
file);