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 13:57:19 UTC
[rocketmq] branch 5.0.0-beta-tmp updated (dfb4cc8 -> c8f6771)
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a change to branch 5.0.0-beta-tmp
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
discard dfb4cc8 Fix bug that container UT can not pass
discard 663a60e Ignore all container IT tests
new c8f6771 Fix bug that container UT can not pass
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (dfb4cc8)
\
N -- N -- N refs/heads/5.0.0-beta-tmp (c8f6771)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/rocketmq/test/container/AddAndRemoveBrokerIT.java | 3 +--
.../test/java/org/apache/rocketmq/test/container/BrokerFailoverIT.java | 3 +--
.../java/org/apache/rocketmq/test/container/BrokerMemberGroupIT.java | 3 +--
.../org/apache/rocketmq/test/container/GetMaxOffsetFromSlaveIT.java | 3 +--
.../org/apache/rocketmq/test/container/PullMultipleReplicasIT.java | 2 --
.../org/apache/rocketmq/test/container/PushMultipleReplicasIT.java | 2 --
.../org/apache/rocketmq/test/container/RebalanceLockOnSlaveIT.java | 1 -
.../java/org/apache/rocketmq/test/container/ScheduledMessageIT.java | 1 -
.../org/apache/rocketmq/test/container/SendMultipleReplicasIT.java | 2 --
.../test/java/org/apache/rocketmq/test/container/SlaveBrokerIT.java | 2 --
.../java/org/apache/rocketmq/test/container/SyncConsumerOffsetIT.java | 2 --
11 files changed, 4 insertions(+), 20 deletions(-)
[rocketmq] 01/01: Fix bug that container UT can not pass
Posted by ji...@apache.org.
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 c8f67716e97a7b05916f5bfaf447ab7c7a712f57
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Fri Mar 18 13:01:23 2022 +0800
Fix bug that container UT can not pass
---
.../rocketmq/container/BrokerContainerStartup.java | 33 ++--------------------
.../container/BrokerContainerStartupTest.java | 13 +--------
.../test/container/AddAndRemoveBrokerIT.java | 1 +
.../rocketmq/test/container/BrokerFailoverIT.java | 1 +
.../test/container/BrokerMemberGroupIT.java | 1 +
.../test/container/GetMaxOffsetFromSlaveIT.java | 1 +
6 files changed, 7 insertions(+), 43 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/container/AddAndRemoveBrokerIT.java b/test/src/test/java/org/apache/rocketmq/test/container/AddAndRemoveBrokerIT.java
index c19a787..1e3b0d1 100644
--- a/test/src/test/java/org/apache/rocketmq/test/container/AddAndRemoveBrokerIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/container/AddAndRemoveBrokerIT.java
@@ -29,6 +29,7 @@ import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
+
public class AddAndRemoveBrokerIT extends ContainerIntegrationTestBase {
private static BrokerContainer brokerContainer4;
diff --git a/test/src/test/java/org/apache/rocketmq/test/container/BrokerFailoverIT.java b/test/src/test/java/org/apache/rocketmq/test/container/BrokerFailoverIT.java
index b4e4baf..0fe08e8 100644
--- a/test/src/test/java/org/apache/rocketmq/test/container/BrokerFailoverIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/container/BrokerFailoverIT.java
@@ -27,6 +27,7 @@ import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
+
public class BrokerFailoverIT extends ContainerIntegrationTestBase {
@Test
diff --git a/test/src/test/java/org/apache/rocketmq/test/container/BrokerMemberGroupIT.java b/test/src/test/java/org/apache/rocketmq/test/container/BrokerMemberGroupIT.java
index ec9b6b1..8e0abd2 100644
--- a/test/src/test/java/org/apache/rocketmq/test/container/BrokerMemberGroupIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/container/BrokerMemberGroupIT.java
@@ -24,6 +24,7 @@ import org.junit.Test;
import static org.awaitility.Awaitility.await;
+
public class BrokerMemberGroupIT extends ContainerIntegrationTestBase {
@Test
public void testSyncBrokerMemberGroup() throws Exception {
diff --git a/test/src/test/java/org/apache/rocketmq/test/container/GetMaxOffsetFromSlaveIT.java b/test/src/test/java/org/apache/rocketmq/test/container/GetMaxOffsetFromSlaveIT.java
index 0b55d77..540c072 100644
--- a/test/src/test/java/org/apache/rocketmq/test/container/GetMaxOffsetFromSlaveIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/container/GetMaxOffsetFromSlaveIT.java
@@ -39,6 +39,7 @@ import org.junit.Test;
import static org.assertj.core.api.Java6Assertions.assertThat;
import static org.awaitility.Awaitility.await;
+
public class GetMaxOffsetFromSlaveIT extends ContainerIntegrationTestBase {
private static DefaultMQProducer mqProducer;