From 33597d161c3f527b6367857b25f66367ac56948d Mon Sep 17 00:00:00 2001 From: wangxye Date: Tue, 31 Oct 2023 15:19:03 +0800 Subject: [PATCH 1/4] feat: support ros e2e test Signed-off-by: wangxye --- java/e2e-v4/pom.xml | 10 ++++------ java/e2e/pom.xml | 5 +++++ .../apache/rocketmq/factory/BaseFactory.java | 3 ++- .../org/apache/rocketmq/frame/BaseOperate.java | 18 ++++++++++-------- java/pom.xml | 6 +++--- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/java/e2e-v4/pom.xml b/java/e2e-v4/pom.xml index 68b61b3..a3fff12 100644 --- a/java/e2e-v4/pom.xml +++ b/java/e2e-v4/pom.xml @@ -76,7 +76,7 @@ org.slf4j slf4j-api - 2.0.0-beta1 + 2.0.9 ch.qos.logback @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.1.2 -Xmx1024m -XX:MaxPermSize=256m 1 @@ -157,11 +157,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 - 1.8 - 1.8 - UTF-8 + 9 + 9 diff --git a/java/e2e/pom.xml b/java/e2e/pom.xml index 833a47e..03f1c03 100644 --- a/java/e2e/pom.xml +++ b/java/e2e/pom.xml @@ -120,6 +120,11 @@ rocketmq-controller 5.1.3-automq-0-SNAPSHOT + + com.automq.rocketmq + rocketmq-cli + 5.1.3-automq-0-SNAPSHOT + org.projectlombok lombok diff --git a/java/e2e/src/main/java/org/apache/rocketmq/factory/BaseFactory.java b/java/e2e/src/main/java/org/apache/rocketmq/factory/BaseFactory.java index 364b855..a800b0f 100644 --- a/java/e2e/src/main/java/org/apache/rocketmq/factory/BaseFactory.java +++ b/java/e2e/src/main/java/org/apache/rocketmq/factory/BaseFactory.java @@ -18,10 +18,11 @@ package org.apache.rocketmq.factory; import com.automq.rocketmq.controller.metadata.GrpcControllerClient; +import com.automq.rocketmq.cli.CliClientConfig; import org.apache.rocketmq.client.apis.ClientServiceProvider; public class BaseFactory { protected static ClientServiceProvider provider = ClientServiceProvider.loadService(); - protected static GrpcControllerClient client = new GrpcControllerClient(); + protected static GrpcControllerClient client = new GrpcControllerClient(new CliClientConfig()); } diff --git a/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java b/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java index dd76395..8e7d9d8 100644 --- a/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java +++ b/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java @@ -22,7 +22,9 @@ import apache.rocketmq.controller.v1.CreateTopicRequest; import apache.rocketmq.controller.v1.GroupType; import apache.rocketmq.controller.v1.MessageType; +import apache.rocketmq.controller.v1.AcceptTypes; import com.automq.rocketmq.controller.metadata.GrpcControllerClient; +import com.automq.rocketmq.cli.CliClientConfig; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import org.apache.rocketmq.client.apis.ClientServiceProvider; @@ -53,7 +55,7 @@ public void run() { log.info("Shutdown Hook is running !"); } }); - client = new GrpcControllerClient(); + client = new GrpcControllerClient(new CliClientConfig()); } // // @@ -84,7 +86,7 @@ protected static String getTopic(String messageType, String methodName) { CreateTopicRequest request = CreateTopicRequest.newBuilder() .setTopic(topic) .setCount(8) - .addAcceptMessageTypes(convertMessageType(messageType)) + .setAcceptTypes(convertAcceptTypes(messageType)) .build(); Long topicId = client.createTopic(endPoint, request).join(); log.info("create topic: {} , topicId:{}", topic, topicId); @@ -95,18 +97,18 @@ protected static String getTopic(String messageType, String methodName) { return null; } - private static MessageType convertMessageType(String typeStr) { + private static AcceptTypes convertAcceptTypes(String typeStr) { switch (typeStr) { case "NORMAL": - return MessageType.NORMAL; + return AcceptTypes.newBuilder().addTypes(MessageType.NORMAL).build(); case "FIFO": - return MessageType.FIFO; + return AcceptTypes.newBuilder().addTypes(MessageType.FIFO).build(); case "DELAY": - return MessageType.DELAY; + return AcceptTypes.newBuilder().addTypes(MessageType.DELAY).build(); case "TRANSACTION": - return MessageType.TRANSACTION; + return AcceptTypes.newBuilder().addTypes(MessageType.TRANSACTION).build(); default: - return MessageType.MESSAGE_TYPE_UNSPECIFIED; + return AcceptTypes.newBuilder().addTypes(MessageType.MESSAGE_TYPE_UNSPECIFIED).build(); } } diff --git a/java/pom.xml b/java/pom.xml index 39e8d32..05d91ec 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -31,8 +31,8 @@ - 8 - 8 + 17 + 17 UTF-8 8 @@ -43,7 +43,7 @@ org.projectlombok lombok - 1.18.8 + 1.18.28 From 55c8d878ba306c889d7a15d61bb03994d9bb9cc2 Mon Sep 17 00:00:00 2001 From: wangxye Date: Tue, 31 Oct 2023 16:22:11 +0800 Subject: [PATCH 2/4] fix: fix the dependecy of proto Signed-off-by: wangxye --- java/e2e/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java/e2e/pom.xml b/java/e2e/pom.xml index 03f1c03..69ebd40 100644 --- a/java/e2e/pom.xml +++ b/java/e2e/pom.xml @@ -125,6 +125,11 @@ rocketmq-cli 5.1.3-automq-0-SNAPSHOT + + com.automq.rocketmq + rocketmq-proto + 5.1.3-automq-0-SNAPSHOT + org.projectlombok lombok From 19a8c44ffc965862ae881ede02c3d359a476f8f4 Mon Sep 17 00:00:00 2001 From: wangxye Date: Tue, 31 Oct 2023 16:43:25 +0800 Subject: [PATCH 3/4] fix: fix the config in e2e remoting Signed-off-by: wangxye --- java/e2e-v4/pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/e2e-v4/pom.xml b/java/e2e-v4/pom.xml index a3fff12..de079a6 100644 --- a/java/e2e-v4/pom.xml +++ b/java/e2e-v4/pom.xml @@ -144,8 +144,10 @@ maven-surefire-plugin 3.1.2 - -Xmx1024m -XX:MaxPermSize=256m - 1 + 1 + 1 + true + -Xmx1024m -XX:MaxMetaspaceSize=256m false From 550a230a567d40cd23d16095aeffe451ef6d0d4d Mon Sep 17 00:00:00 2001 From: wangxye Date: Tue, 31 Oct 2023 17:20:20 +0800 Subject: [PATCH 4/4] fix: fix the setMaxRetryAttempt Signed-off-by: wangxye --- .../src/main/java/org/apache/rocketmq/frame/BaseOperate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java b/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java index 8e7d9d8..4ca76f5 100644 --- a/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java +++ b/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java @@ -148,7 +148,7 @@ protected static String getGroupId(String methodName) { // prepare consumer group CreateGroupRequest request = CreateGroupRequest.newBuilder() .setName(groupId) - .setMaxRetryAttempt(16) + .setMaxDeliveryAttempt(16) .setGroupType(GroupType.GROUP_TYPE_STANDARD) .build(); CreateGroupReply reply = createConsumerGroup(request).join(); @@ -161,7 +161,7 @@ protected static String getOrderlyGroupId(String methodName) { String groupId = String.format("GID_%s_%s", methodName, RandomUtils.getStringWithCharacter(6)); CreateGroupRequest request = CreateGroupRequest.newBuilder() .setName(groupId) - .setMaxRetryAttempt(16) + .setMaxDeliveryAttempt(16) .setGroupType(GroupType.GROUP_TYPE_FIFO) .build(); CreateGroupReply reply = createConsumerGroup(request).join();