Skip to content

fix(proxy): offline all lite subscriptions and guard empty subscription list #11149

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

Open
zjncs wants to merge 1 commit into
base: develop
Choose a base branch
from
+61 −15
Open

fix(proxy): offline all lite subscriptions and guard empty subscription list #11149

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
35 changes: 20 additions & 15 deletions proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcClientSettingsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import apache.rocketmq.v2.ExponentialBackoff;
import apache.rocketmq.v2.Metric;
import apache.rocketmq.v2.Settings;
import apache.rocketmq.v2.Subscription;
import apache.rocketmq.v2.SubscriptionEntry;
import com.google.protobuf.Duration;
import com.google.protobuf.util.Durations;
import java.util.Arrays;
Expand Down Expand Up @@ -237,21 +239,24 @@ public void offlineClientLiteSubscription(ProxyContext ctx, String clientId, Set
return;
}
try {
String topic = settings.getSubscription().getSubscriptions(0).getTopic().getName();
String group = settings.getSubscription().getGroup().getName();
log.info("offlineClientLiteSubscription, topic:{}, group:{}, clientId:{}", topic, group, clientId);
LiteSubscriptionDTO liteSubscriptionDTO = new LiteSubscriptionDTO()
.setAction(LiteSubscriptionAction.COMPLETE_REMOVE)
.setClientId(clientId)
.setGroup(group)
.setTopic(topic);
this.messagingProcessor.syncLiteSubscription(ctx, liteSubscriptionDTO, java.time.Duration.ofSeconds(2).toMillis())
.whenComplete((result, throwable) -> {
if (throwable != null) {
log.error("offlineClientLiteSubscription failed, topic:{}, group:{}, clientId:{}",
topic, group, clientId, throwable);
}
});
Subscription subscription = settings.getSubscription();
String group = subscription.getGroup().getName();
for (SubscriptionEntry subscriptionEntry : subscription.getSubscriptionsList()) {
String topic = subscriptionEntry.getTopic().getName();
log.info("offlineClientLiteSubscription, topic:{}, group:{}, clientId:{}", topic, group, clientId);
LiteSubscriptionDTO liteSubscriptionDTO = new LiteSubscriptionDTO()
.setAction(LiteSubscriptionAction.COMPLETE_REMOVE)
.setClientId(clientId)
.setGroup(group)
.setTopic(topic);
this.messagingProcessor.syncLiteSubscription(ctx, liteSubscriptionDTO, java.time.Duration.ofSeconds(2).toMillis())
.whenComplete((result, throwable) -> {
if (throwable != null) {
log.error("offlineClientLiteSubscription failed, topic:{}, group:{}, clientId:{}",
topic, group, clientId, throwable);
}
});
}
} catch (Exception e) {
log.error("offlineClientLiteSubscription error, clientId:{}, settings:{}", clientId, settings, e);
}
Expand Down
41 changes: 41 additions & 0 deletions ...src/test/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcClientSettingsManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,4 +201,45 @@ public void testOfflineClientLiteSubscription_ValidLiteConsumer_SyncThrowsExcept

verify(messagingProcessor, times(1)).syncLiteSubscription(any(), any(LiteSubscriptionDTO.class), anyLong());
}

@Test
public void testOfflineClientLiteSubscription_MultipleTopics_AllSubscriptionsRemoved() {
Subscription subscription = Subscription.newBuilder()
.setGroup(Resource.newBuilder().setName("testGroup").build())
.addSubscriptions(SubscriptionEntry.newBuilder()
.setTopic(Resource.newBuilder().setName("testTopic0").build())
.build())
.addSubscriptions(SubscriptionEntry.newBuilder()
.setTopic(Resource.newBuilder().setName("testTopic1").build())
.build())
.build();

Settings settings = Settings.newBuilder()
.setClientType(ClientType.LITE_PUSH_CONSUMER)
.setSubscription(subscription)
.build();

when(messagingProcessor.syncLiteSubscription(any(), any(LiteSubscriptionDTO.class), anyLong()))
.thenReturn(CompletableFuture.completedFuture(null));

grpcClientSettingsManager.offlineClientLiteSubscription(ctx, clientId, settings);

verify(messagingProcessor, times(2)).syncLiteSubscription(any(), any(LiteSubscriptionDTO.class), anyLong());
}

@Test
public void testOfflineClientLiteSubscription_EmptySubscriptions_NoException() {
Subscription subscription = Subscription.newBuilder()
.setGroup(Resource.newBuilder().setName("testGroup").build())
.build();

Settings settings = Settings.newBuilder()
.setClientType(ClientType.LITE_SIMPLE_CONSUMER)
.setSubscription(subscription)
.build();

grpcClientSettingsManager.offlineClientLiteSubscription(ctx, clientId, settings);

verify(messagingProcessor, never()).syncLiteSubscription(any(), any(), anyLong());
}
}