Skip to content

[ISSUE #10345] fix: preserve lite topic for auto-renew receipt handles #10346

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

[ISSUE #10345] fix: preserve lite topic for auto-renew receipt handles #10346

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
3 changes: 2 additions & 1 deletion proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ private Runnable handleAutoRenew(ProxyContext ctx, ReceiveMessageRequest request
if (receiptHandle != null) {
MessageReceiptHandle messageReceiptHandle =
new MessageReceiptHandle(group, topic, messageExt.getQueueId(), receiptHandle, messageExt.getMsgId(),
messageExt.getQueueOffset(), messageExt.getReconsumeTimes());
messageExt.getQueueOffset(), messageExt.getReconsumeTimes(),
messageExt.getProperty(MessageConst.PROPERTY_LITE_TOPIC));
messagingProcessor.addReceiptHandle(ctx, clientChannel, group, messageExt.getMsgId(), messageReceiptHandle);
}
}
Expand Down
61 changes: 61 additions & 0 deletions .../src/test/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.rocketmq.proxy.grpc.v2.consumer;

import apache.rocketmq.v2.Code;
import apache.rocketmq.v2.ClientType;
import apache.rocketmq.v2.FilterExpression;
import apache.rocketmq.v2.FilterType;
import apache.rocketmq.v2.MessageQueue;
Expand Down Expand Up @@ -45,6 +46,7 @@
import org.apache.rocketmq.common.message.MessageAccessor;
import org.apache.rocketmq.common.message.MessageConst;
import org.apache.rocketmq.common.message.MessageExt;
import org.apache.rocketmq.proxy.common.MessageReceiptHandle;
import org.apache.rocketmq.proxy.common.ProxyContext;
import org.apache.rocketmq.proxy.config.ConfigurationManager;
import org.apache.rocketmq.proxy.grpc.v2.BaseActivityTest;
Expand All @@ -64,6 +66,7 @@
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -319,6 +322,64 @@ public void testReceiveMessageAddReceiptHandle() {
assertEquals(Arrays.asList(popCk1, popCk2), receiptHandleCaptor.getAllValues().stream().map(ReceiptHandle::encode).collect(Collectors.toList()));
}

@Test
public void testReceiveLiteMessageAddReceiptHandleWithLiteTopic() {
ConfigurationManager.getProxyConfig().setEnableProxyAutoRenew(true);
StreamObserver<ReceiveMessageResponse> receiveStreamObserver = mock(ServerCallStreamObserver.class);
doNothing().when(receiveStreamObserver).onNext(any());
when(this.grpcClientSettingsManager.getClientSettings(any())).thenReturn(Settings.newBuilder()
.setClientType(ClientType.LITE_PUSH_CONSUMER)
.build());

String msgId = "liteMsgId";
String liteTopic = "liteTopic";
String popCk = "0 0 60000 0 0 broker 0 0 0";
MessageExt messageExt = new MessageExt();
messageExt.setTopic(TOPIC);
messageExt.setMsgId(msgId);
MessageAccessor.putProperty(messageExt, MessageConst.PROPERTY_POP_CK, popCk);
MessageAccessor.putProperty(messageExt, MessageConst.PROPERTY_LITE_TOPIC, liteTopic);
messageExt.setBody("body".getBytes());

PopResult popResult = new PopResult(PopStatus.FOUND, Collections.singletonList(messageExt));
when(this.messagingProcessor.popLiteMessage(
any(),
any(),
anyString(),
anyString(),
anyInt(),
anyLong(),
anyLong(),
any(),
any(),
isNull(),
anyLong())).thenReturn(CompletableFuture.completedFuture(popResult));

ArgumentCaptor<MessageReceiptHandle> messageReceiptHandleCaptor = ArgumentCaptor.forClass(MessageReceiptHandle.class);

ProxyContext ctx = createContext();
this.grpcChannelManager.createChannel(ctx, ctx.getClientID());
ReceiveMessageRequest receiveMessageRequest = ReceiveMessageRequest.newBuilder()
.setGroup(Resource.newBuilder().setName(CONSUMER_GROUP).build())
.setMessageQueue(MessageQueue.newBuilder().setTopic(Resource.newBuilder().setName(TOPIC).build()).build())
.setAutoRenew(true)
.setFilterExpression(FilterExpression.newBuilder()
.setType(FilterType.TAG)
.setExpression("*")
.build())
.build();

this.receiveMessageActivity.receiveMessage(ctx, receiveMessageRequest, receiveStreamObserver);

verify(this.messagingProcessor).addReceiptHandle(
any(),
any(),
eq(CONSUMER_GROUP),
eq(msgId),
messageReceiptHandleCaptor.capture());
assertEquals(liteTopic, messageReceiptHandleCaptor.getValue().getLiteTopic());
}

@Test
public void testReceiveMessage() {
StreamObserver<ReceiveMessageResponse> receiveStreamObserver = mock(ServerCallStreamObserver.class);
Expand Down
Loading