This is an automated email from the ASF dual-hosted git repository.
lizhanhui 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 86e435419 [ISSUE: 4974]Fix name server client config when OS picks up
available port (#4975)
86e435419 is described below
commit 86e435419d880c58f3b7575fb381dd64cd1592fe
Author: Zhanhui Li <[email protected]>
AuthorDate: Fri Sep 2 15:20:23 2022 +0800
[ISSUE: 4974]Fix name server client config when OS picks up available port
(#4975)
* Fix name server client config when OS picks up available port
* Fix check style issue
---
.../org/apache/rocketmq/namesrv/NamesrvController.java | 8 +++++---
.../java/org/apache/rocketmq/test/base/BaseConf.java | 16 ++++++++++++++--
test/src/test/resources/logback-test.xml | 2 +-
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git
a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java
b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java
index 827c9ce61..04abae285 100644
--- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java
+++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java
@@ -16,7 +16,7 @@
*/
package org.apache.rocketmq.namesrv;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
@@ -141,7 +141,6 @@ public class NamesrvController {
}
};
this.remotingClient = new NettyRemotingClient(this.nettyClientConfig);
-
this.remotingClient.updateNameServerAddressList(Arrays.asList(RemotingUtil.getLocalAddress()
+ ":" + this.nettyServerConfig.getListenPort()));
this.registerProcessor();
@@ -248,13 +247,16 @@ public class NamesrvController {
public void start() throws Exception {
this.remotingServer.start();
- this.remotingClient.start();
// In test scenarios where it is up to OS to pick up an available
port, set the listening port back to config
if (0 == nettyServerConfig.getListenPort()) {
nettyServerConfig.setListenPort(this.remotingServer.localListenPort());
}
+
this.remotingClient.updateNameServerAddressList(Collections.singletonList(RemotingUtil.getLocalAddress()
+ + ":" + nettyServerConfig.getListenPort()));
+ this.remotingClient.start();
+
if (this.fileWatchService != null) {
this.fileWatchService.start();
}
diff --git a/test/src/test/java/org/apache/rocketmq/test/base/BaseConf.java
b/test/src/test/java/org/apache/rocketmq/test/base/BaseConf.java
index 0f26f2042..4495b37ba 100644
--- a/test/src/test/java/org/apache/rocketmq/test/base/BaseConf.java
+++ b/test/src/test/java/org/apache/rocketmq/test/base/BaseConf.java
@@ -27,7 +27,6 @@ import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.client.consumer.MQPullConsumer;
import org.apache.rocketmq.client.consumer.MQPushConsumer;
@@ -52,6 +51,8 @@ import org.apache.rocketmq.test.util.MQRandomUtils;
import org.apache.rocketmq.tools.admin.DefaultMQAdminExt;
import org.apache.rocketmq.tools.admin.MQAdminExt;
import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.awaitility.Awaitility.await;
@@ -74,15 +75,26 @@ public class BaseConf {
protected final static Map<String, BrokerController> brokerControllerMap;
protected final static List<Object> mqClients = new ArrayList<Object>();
protected final static boolean debug = false;
- private final static Logger log = Logger.getLogger(BaseConf.class);
+ private final static Logger log = LoggerFactory.getLogger(BaseConf.class);
static {
System.setProperty(RemotingCommand.REMOTING_VERSION_KEY,
Integer.toString(MQVersion.CURRENT_VERSION));
namesrvController = IntegrationTestBase.createAndStartNamesrv();
nsAddr = "127.0.0.1:" +
namesrvController.getNettyServerConfig().getListenPort();
+ log.debug("Name server started, listening: {}", nsAddr);
+
brokerController1 = IntegrationTestBase.createAndStartBroker(nsAddr);
+ log.debug("Broker {} started, listening: {}",
brokerController1.getBrokerConfig().getBrokerName(),
+ brokerController1.getBrokerConfig().getListenPort());
+
brokerController2 = IntegrationTestBase.createAndStartBroker(nsAddr);
+ log.debug("Broker {} started, listening: {}",
brokerController2.getBrokerConfig().getBrokerName(),
+ brokerController2.getBrokerConfig().getListenPort());
+
brokerController3 = IntegrationTestBase.createAndStartBroker(nsAddr);
+ log.debug("Broker {} started, listening: {}",
brokerController2.getBrokerConfig().getBrokerName(),
+ brokerController2.getBrokerConfig().getListenPort());
+
clusterName =
brokerController1.getBrokerConfig().getBrokerClusterName();
broker1Name = brokerController1.getBrokerConfig().getBrokerName();
broker2Name = brokerController2.getBrokerConfig().getBrokerName();
diff --git a/test/src/test/resources/logback-test.xml
b/test/src/test/resources/logback-test.xml
index e7ebef1af..2f00e3cc1 100644
--- a/test/src/test/resources/logback-test.xml
+++ b/test/src/test/resources/logback-test.xml
@@ -27,7 +27,7 @@
</appender>
<root>
- <level value="OFF"/>
+ <level value="ERROR"/>
<appender-ref ref="DefaultAppender"/>
</root>
</configuration>
