Skip to content

[ISSUE #10784] Drop POP messages without receipt handles #10785

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

[ISSUE #10784] Drop POP messages without receipt handles #10785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5588873
[ISSUE #10784] Drop POP messages without receipt handles
Aias00 Aug 3, 2026
de992d8
test(proxy): bound pop message regression wait
Aias00 Aug 4, 2026
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
1 change: 0 additions & 1 deletion proxy/src/main/java/org/apache/rocketmq/proxy/processor/ConsumerProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ private PopResult filterPopResult(ProxyContext ctx, PopResult popResult, Command
String handleString = createHandle(messageExt.getProperty(MessageConst.PROPERTY_POP_CK), messageExt.getCommitLogOffset());
if (handleString == null) {
log.error("[BUG] pop message from broker but handle is empty. requestHeader:{}, msg:{}", requestHeader, messageExt);
messageExtList.add(messageExt);
continue;
}
MessageAccessor.putProperty(messageExt, MessageConst.PROPERTY_POP_CK, handleString);
Expand Down
41 changes: 41 additions & 0 deletions proxy/src/test/java/org/apache/rocketmq/proxy/processor/ConsumerProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.rocketmq.client.consumer.AckResult;
import org.apache.rocketmq.client.consumer.AckStatus;
import org.apache.rocketmq.client.consumer.PopResult;
Expand All @@ -39,6 +41,7 @@
import org.apache.rocketmq.common.constant.ConsumeInitMode;
import org.apache.rocketmq.common.consumer.ReceiptHandle;
import org.apache.rocketmq.common.filter.ExpressionType;
import org.apache.rocketmq.common.message.MessageAccessor;
import org.apache.rocketmq.common.message.MessageClientIDSetter;
import org.apache.rocketmq.common.message.MessageConst;
import org.apache.rocketmq.common.message.MessageExt;
Expand Down Expand Up @@ -158,6 +161,44 @@ public void testPopMessage() throws Throwable {
assertEquals(messageExtList.get(2).getMsgId(), toDLQMessageIdArgumentCaptor.getValue());
}

@Test
public void testPopMessageShouldDropMessageWithoutReceiptHandle() throws Throwable {
final long invisibleTime = Duration.ofSeconds(15).toMillis();
MessageExt messageExt = createMessageExt(TOPIC, "tag", 0, invisibleTime);
MessageAccessor.clearProperty(messageExt, MessageConst.PROPERTY_POP_CK);
PopResult innerPopResult = new PopResult(PopStatus.FOUND, Collections.singletonList(messageExt));
when(this.messageService.popMessage(any(), any(), any(), anyLong()))
.thenReturn(CompletableFuture.completedFuture(innerPopResult));
when(this.topicRouteService.getCurrentMessageQueueView(any(), anyString()))
.thenReturn(mock(MessageQueueView.class));

AtomicBoolean filterInvoked = new AtomicBoolean(false);
PopMessageResultFilter popMessageResultFilter = (ctx, consumerGroup, subscriptionData, message) -> {
filterInvoked.set(true);
return PopMessageResultFilter.FilterResult.MATCH;
};

PopResult popResult = this.consumerProcessor.popMessage(
createContext(),
(ctx, messageQueueView) -> mock(AddressableMessageQueue.class),
CONSUMER_GROUP,
TOPIC,
60,
invisibleTime,
Duration.ofSeconds(3).toMillis(),
ConsumeInitMode.MAX,
FilterAPI.build(TOPIC, "*", ExpressionType.TAG),
false,
popMessageResultFilter,
null,
Duration.ofSeconds(3).toMillis()
).get(5, TimeUnit.SECONDS);

assertEquals(PopStatus.FOUND, popResult.getPopStatus());
assertThat(popResult.getMsgFoundList()).isEmpty();
assertFalse(filterInvoked.get());
}

@Test
public void testAckMessage() throws Throwable {
ReceiptHandle handle = create(createMessageExt(MixAll.RETRY_GROUP_TOPIC_PREFIX + TOPIC, "", 0, 3000));
Expand Down
Loading