Skip to content

[ISSUE #10285] Fix preserve popTime when rebuilding AckResult #10286

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 2 commits into
base: develop
Choose a base branch
from
+24 −1
Open

[ISSUE #10285] Fix preserve popTime when rebuilding AckResult #10286

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
806ef83
[ISSUE #10285] Fix preserve popTime when rebuilding AckResult
yx9o May 5, 2026
5ce7acb
Merge branch 'develop' into dev-10285
yx9o May 6, 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
2 changes: 1 addition & 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 @@ -431,7 +431,7 @@ public CompletableFuture<AckResult> changeInvisibleTime(ProxyContext ctx, Receip
if (StringUtils.isNotBlank(ackResult.getExtraInfo())) {
AckResult result = new AckResult();
result.setStatus(ackResult.getStatus());
result.setPopTime(result.getPopTime());
result.setPopTime(ackResult.getPopTime());
result.setExtraInfo(createHandle(ackResult.getExtraInfo(), commitLogOffset));
return result;
} else {
Expand Down
23 changes: 23 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 @@ -40,6 +40,7 @@
import org.apache.rocketmq.common.consumer.ReceiptHandle;
import org.apache.rocketmq.common.filter.ExpressionType;
import org.apache.rocketmq.common.message.MessageClientIDSetter;
import org.apache.rocketmq.common.message.MessageConst;
import org.apache.rocketmq.common.message.MessageExt;
import org.apache.rocketmq.common.message.MessageQueue;
import org.apache.rocketmq.proxy.common.ProxyContext;
Expand Down Expand Up @@ -301,6 +302,28 @@ public void testChangeInvisibleTime() throws Throwable {
assertEquals(handle.getReceiptHandle(), requestHeaderArgumentCaptor.getValue().getExtraInfo());
}

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

long popTime = 1777203436411L;
String newExtraInfo = "newExtraInfo";
AckResult innerAckResult = new AckResult();
innerAckResult.setStatus(AckStatus.OK);
innerAckResult.setPopTime(popTime);
innerAckResult.setExtraInfo(newExtraInfo);
when(this.messageService.changeInvisibleTime(any(), any(), anyString(), any(), anyLong()))
.thenReturn(CompletableFuture.completedFuture(innerAckResult));

AckResult ackResult = this.consumerProcessor.changeInvisibleTime(createContext(), handle,
MessageClientIDSetter.createUniqID(), CONSUMER_GROUP, TOPIC, 1000, null, 3000, true).get();

assertEquals(AckStatus.OK, ackResult.getStatus());
assertEquals(newExtraInfo + MessageConst.KEY_SEPARATOR + handle.getCommitLogOffset(), ackResult.getExtraInfo());
assertEquals(popTime, ackResult.getPopTime());
}

@Test
public void testLockBatch() throws Throwable {
Set<MessageQueue> mqSet = new HashSet<>();
Expand Down
Loading