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/03/18 09:12:21 UTC
[rocketmq] 01/01: Fix bug that container UT can not pass
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch 5.0.0-beta-tmp
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit dbed501211cd7d9cf441a9d403e0a21d63c64c4b
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Fri Mar 18 14:40:14 2022 +0800
Fix bug that container UT can not pass
---
.../rocketmq/container/BrokerContainerStartup.java | 33 ++--------------------
.../container/BrokerContainerStartupTest.java | 13 +--------
.../rocketmq/test/statictopic/StaticTopicIT.java | 3 +-
3 files changed, 4 insertions(+), 45 deletions(-)
diff --git a/container/src/main/java/org/apache/rocketmq/container/BrokerContainerStartup.java b/container/src/main/java/org/apache/rocketmq/container/BrokerContainerStartup.java
index a238da1..94066af 100644
--- a/container/src/main/java/org/apache/rocketmq/container/BrokerContainerStartup.java
+++ b/container/src/main/java/org/apache/rocketmq/container/BrokerContainerStartup.java
@@ -68,38 +68,9 @@ public class BrokerContainerStartup {
createAndStartBrokers(brokerContainer);
}
- /**
- * Start brokerController, for old version compatibility.
- *
- * @param controller brokerController
- * @return brokerController
- */
- public static BrokerController start(BrokerController controller) {
- try {
-
- controller.start();
-
- String tip = "The broker[" + controller.getBrokerConfig().getBrokerName() + ", "
- + controller.getBrokerAddr() + "] boot success. serializeType=" + RemotingCommand.getSerializeTypeConfigInThisServer();
-
- if (null != controller.getBrokerConfig().getNamesrvAddr()) {
- tip += " and name server is " + controller.getBrokerConfig().getNamesrvAddr();
- }
-
- log.info(tip);
- System.out.printf("%s%n", tip);
- return controller;
- } catch (Throwable e) {
- e.printStackTrace();
- System.exit(-1);
- }
-
- return null;
- }
-
public static BrokerController createBrokerController(String[] args) {
- final BrokerContainer sharedBrokerController = startBrokerContainer(createBrokerContainer(args));
- return createAndInitializeBroker(sharedBrokerController, configFile, properties);
+ final BrokerContainer brokerContainer = startBrokerContainer(createBrokerContainer(args));
+ return createAndInitializeBroker(brokerContainer, configFile, properties);
}
public static List<BrokerController> createAndStartBrokers(BrokerContainer brokerContainer) {
diff --git a/container/src/test/java/org/apache/rocketmq/container/BrokerContainerStartupTest.java b/container/src/test/java/org/apache/rocketmq/container/BrokerContainerStartupTest.java
index 8138098..68e4a87 100644
--- a/container/src/test/java/org/apache/rocketmq/container/BrokerContainerStartupTest.java
+++ b/container/src/test/java/org/apache/rocketmq/container/BrokerContainerStartupTest.java
@@ -102,7 +102,7 @@ public class BrokerContainerStartupTest {
}
@Test
- public void testStartBroker1() {
+ public void testStartBrokerContainer() {
BrokerContainer brokerContainer = BrokerContainerStartup.startBrokerContainer(
BrokerContainerStartup.createBrokerContainer(Arrays.array("-c", brokerContainerConfigPath)));
assertThat(brokerContainer).isNotNull();
@@ -113,17 +113,6 @@ public class BrokerContainerStartupTest {
assertThat(brokerContainer.getBrokerControllers().size()).isEqualTo(0);
}
- @Test
- public void testStartBroker2() {
- InnerBrokerController brokerController = (InnerBrokerController) BrokerContainerStartup.start(BrokerContainerStartup.createBrokerController(Arrays.array("-c", brokerConfigPath)));
- assertThat(brokerController).isNotNull();
-
- assertThat(brokerController.getBrokerContainer().getBrokerControllers().size()).isEqualTo(1);
-
- brokerController.getBrokerContainer().shutdown();
- assertThat(brokerController.getBrokerContainer().getBrokerControllers().size()).isEqualTo(0);
- }
-
private static File createBaseDir(String prefix) {
final File file;
try {
diff --git a/test/src/test/java/org/apache/rocketmq/test/statictopic/StaticTopicIT.java b/test/src/test/java/org/apache/rocketmq/test/statictopic/StaticTopicIT.java
index ed93e86..b47904b 100644
--- a/test/src/test/java/org/apache/rocketmq/test/statictopic/StaticTopicIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/statictopic/StaticTopicIT.java
@@ -97,8 +97,7 @@ public class StaticTopicIT extends BaseConf {
sendMessagesAndCheck(producer, getBrokers(), topic, queueNum, msgEachQueue, 100);
}
}
-
- @Ignore
+
@Test
public void testCommandsWithBrokers() throws Exception {
//This case is used to mock the env to test the command manually