Skip to content

[ISSUE #10962] Fix lite subscription quota validation for remove actions #10963

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
yx9o wants to merge 1 commit into
base: develop
Choose a base branch
from
+44 −2
Open

[ISSUE #10962] Fix lite subscription quota validation for remove actions #10963

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
10 changes: 8 additions & 2 deletions proxy/src/main/java/org/apache/rocketmq/proxy/processor/ClientProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,14 @@ public CompletableFuture<Void> syncLiteSubscription(ProxyContext ctx,
LiteSubscriptionDTO liteSubscriptionDTO, long timeoutMillis
) {
try {
LiteSubscriptionAction action = liteSubscriptionDTO.getAction();
validateLiteBindTopic(ctx, liteSubscriptionDTO.getGroup(), liteSubscriptionDTO.getTopic());
if (CollectionUtils.isNotEmpty(liteSubscriptionDTO.getLiteTopicSet())) {
if (CollectionUtils.isNotEmpty(liteSubscriptionDTO.getLiteTopicSet())
&& shouldValidateLiteSubscriptionQuota(action)) {
validateLiteSubscriptionQuota(ctx, liteSubscriptionDTO.getGroup(), liteSubscriptionDTO.getLiteTopicSet().size());
}

if (LiteSubscriptionAction.PARTIAL_ADD == liteSubscriptionDTO.getAction()) {
if (LiteSubscriptionAction.PARTIAL_ADD == action) {
if (!syncLiteSubscriptionRateLimiter.tryAcquire()) {
String msg = String.format("Too many syncLiteSubscription requests, topic=%s, group=%s, clientId=%s",
liteSubscriptionDTO.getTopic(), liteSubscriptionDTO.getGroup(), ctx.getClientID());
Expand All @@ -139,6 +141,10 @@ public CompletableFuture<Void> syncLiteSubscription(ProxyContext ctx,
}
}

private boolean shouldValidateLiteSubscriptionQuota(LiteSubscriptionAction action) {
return LiteSubscriptionAction.PARTIAL_ADD == action || LiteSubscriptionAction.COMPLETE_ADD == action;
}

public ClientChannelInfo findConsumerChannel(
ProxyContext ctx,
String consumerGroup,
Expand Down
36 changes: 36 additions & 0 deletions proxy/src/test/java/org/apache/rocketmq/proxy/processor/ClientProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@

import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import org.apache.rocketmq.common.lite.LiteSubscriptionAction;
import org.apache.rocketmq.common.lite.LiteSubscriptionDTO;
import org.apache.rocketmq.proxy.common.ProxyContext;
import org.apache.rocketmq.proxy.config.ConfigurationManager;
import org.apache.rocketmq.proxy.grpc.v2.common.GrpcProxyException;
import org.apache.rocketmq.proxy.service.ServiceManager;
import org.apache.rocketmq.proxy.service.lite.LiteSubscriptionService;
import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
Expand All @@ -36,6 +40,10 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

@RunWith(MockitoJUnitRunner.class)
Expand All @@ -53,6 +61,9 @@ public class ClientProcessorTest {
@Mock
private SubscriptionGroupConfig groupConfig;

@Mock
private LiteSubscriptionService liteSubscriptionService;

private ClientProcessor clientProcessor;

@Before
Expand Down Expand Up @@ -195,6 +206,31 @@ public void testValidateLiteSubscriptionQuota_exceedsQuota_throwsException() {
assertTrue(exception.getMessage().contains("lite subscription quota exceeded"));
}

@Test
public void testSyncLiteSubscription_partialRemoveSkipsQuotaValidation() {
String group = "group";
String topic = "topic";
Set<String> liteTopicSet = new HashSet<>();
for (int i = 0; i < 400; i++) {
liteTopicSet.add("liteTopic-" + i);
}
LiteSubscriptionDTO dto = new LiteSubscriptionDTO()
.setAction(LiteSubscriptionAction.PARTIAL_REMOVE)
.setGroup(group)
.setTopic(topic)
.setLiteTopicSet(liteTopicSet);

when(groupConfig.getLiteBindTopic()).thenReturn(topic);
when(messagingProcessor.getSubscriptionGroupConfig(ctx, group)).thenReturn(groupConfig);
when(serviceManager.getLiteSubscriptionService()).thenReturn(liteSubscriptionService);
when(liteSubscriptionService.syncLiteSubscription(any(), any(), anyLong()))
.thenReturn(CompletableFuture.completedFuture(null));

assertDoesNotThrow(() -> clientProcessor.syncLiteSubscription(ctx, dto, 3000).join());
verify(groupConfig, never()).getLiteSubClientQuota();
verify(liteSubscriptionService).syncLiteSubscription(ctx, dto, 3000);
}

@Test
public void testGetGroupOrException_groupExists_returnsConfig() {
String group = "group";
Expand Down
Loading