Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: adapt to create consumer groups #18

Merged
merged 1 commit into from
Nov 29, 2023
Merged

fix: adapt to create consumer groups #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions java/e2e-v4/src/main/java/org/apache/rocketmq/frame/BaseOperate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.rocketmq.frame;

import apache.rocketmq.controller.v1.AcceptTypes;
import apache.rocketmq.controller.v1.CreateGroupReply;
import apache.rocketmq.controller.v1.CreateGroupRequest;
import apache.rocketmq.controller.v1.CreateTopicRequest;
import apache.rocketmq.controller.v1.GroupType;
Expand Down Expand Up @@ -94,7 +93,7 @@ protected static String getGroupId(String methodName, SubscriptionMode mode) {
.setGroupType(GroupType.GROUP_TYPE_STANDARD)
.setSubMode(mode)
.build();
CreateGroupReply reply = createConsumerGroup(request).join();
Long reply = createConsumerGroup(request).join();
logger.info("[ConsumerGroupId] groupId:{} , methodName:{} , mode: {} , reply:{}", groupId, methodName, mode, reply);
return groupId;
}
Expand All @@ -107,14 +106,14 @@ protected static String getOrderlyGroupId(String methodName, SubscriptionMode mo
.setGroupType(GroupType.GROUP_TYPE_FIFO)
.setSubMode(mode)
.build();
CreateGroupReply reply = createConsumerGroup(request).join();
Long reply = createConsumerGroup(request).join();
logger.info("[ConsumerGroupId] groupId:{} methodName:{} reply:{}", groupId, methodName, reply);
return groupId;
}

private static CompletableFuture<CreateGroupReply> createConsumerGroup(CreateGroupRequest request) {
private static CompletableFuture<Long> createConsumerGroup(CreateGroupRequest request) {
try {
CompletableFuture<CreateGroupReply> groupCf = client.createGroup(namesrvAddr, request);
CompletableFuture<Long> groupCf = client.createGroup(namesrvAddr, request);
return groupCf.exceptionally(throwable -> {
logger.error("Create group failed", throwable);
throw new CompletionException(throwable);
Expand Down
11 changes: 5 additions & 6 deletions java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.rocketmq.frame;

import apache.rocketmq.controller.v1.CreateGroupReply;
import apache.rocketmq.controller.v1.CreateGroupRequest;
import apache.rocketmq.controller.v1.CreateTopicRequest;
import apache.rocketmq.controller.v1.GroupType;
Expand Down Expand Up @@ -157,7 +156,7 @@ protected static String getGroupId(String methodName, SubscriptionMode mode) {
.setGroupType(GroupType.GROUP_TYPE_STANDARD)
.setSubMode(mode)
.build();
CreateGroupReply reply = createConsumerGroup(request).join();
Long reply = createConsumerGroup(request).join();
log.info("[ConsumerGroupId] groupId:{} , methodName:{} , mode: {} , reply:{}", groupId, methodName, mode, reply);
return groupId;
}
Expand All @@ -171,7 +170,7 @@ protected static String getOrderlyGroupId(String methodName) {
.setGroupType(GroupType.GROUP_TYPE_FIFO)
.setSubMode(SubscriptionMode.SUB_MODE_POP)
.build();
CreateGroupReply reply = createConsumerGroup(request).join();
Long reply = createConsumerGroup(request).join();
log.info("[ConsumerGroupId] groupId:{} methodName:{} reply:{}", groupId, methodName, reply);
return groupId;
}
Expand All @@ -184,14 +183,14 @@ protected static String getOrderlyGroupId(String methodName, SubscriptionMode mo
.setGroupType(GroupType.GROUP_TYPE_FIFO)
.setSubMode(mode)
.build();
CreateGroupReply reply = createConsumerGroup(request).join();
Long reply = createConsumerGroup(request).join();
log.info("[ConsumerGroupId] groupId:{} methodName:{} reply:{}", groupId, methodName, reply);
return groupId;
}

private static CompletableFuture<CreateGroupReply> createConsumerGroup(CreateGroupRequest request) {
private static CompletableFuture<Long> createConsumerGroup(CreateGroupRequest request) {
try {
CompletableFuture<CreateGroupReply> groupCf = client.createGroup(account.getEndpoint(), request);
CompletableFuture<Long> groupCf = client.createGroup(account.getEndpoint(), request);
return groupCf.exceptionally(throwable -> {
log.error("Create group failed", throwable);
throw new CompletionException(throwable);
Expand Down