Skip to content

[ISSUE #10276] Fix PopConsumerService changeInvisibilityDuration losing CK record when visibilityTimeout collision #10277

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
qianye1001 wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

[ISSUE #10276] Fix PopConsumerService changeInvisibilityDuration losing CK record when visibilityTimeout collision #10277

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8001d6a
[ISSUE #10276] Fix PopConsumerService changeInvisibilityDuration losi…
qianye1001 Apr 28, 2026
6152fc3
support batch change
qianye1001 Apr 28, 2026
fbc7e76
ci: trigger CI re-run for flaky test DefaultMessageStoreTest.testClea…
qianye1001 Apr 28, 2026
aa5542c
ci: re-trigger CI for flaky test DefaultMQLitePullConsumerWithTraceTe…
qianye1001 Apr 28, 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
13 changes: 10 additions & 3 deletions broker/src/main/java/org/apache/rocketmq/broker/pop/PopConsumerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,8 +511,10 @@ public void changeInvisibilityDuration(long popTime, long invisibleTime, long ch

// No need to generate new records when the group does not exist,
// because these retry messages will not be consumed by anyone.
if (brokerConfig.isPopReviveSkipIfGroupAbsent() &&
!brokerController.getSubscriptionGroupManager().containsSubscriptionGroup(groupId)) {
boolean skipWrite = brokerConfig.isPopReviveSkipIfGroupAbsent() &&
!brokerController.getSubscriptionGroupManager().containsSubscriptionGroup(groupId);

if (skipWrite) {
log.info("PopConsumerService change invisibility skip, time={}, " +
"groupId={}, topicId={}, queueId={}, offset={}", popTime, groupId, topicId, queueId, offset);
} else {
Expand All @@ -525,7 +527,12 @@ public void changeInvisibilityDuration(long popTime, long invisibleTime, long ch
}
}

this.popConsumerStore.deleteRecords(Collections.singletonList(ackRecord));
// If the new CK has the same key as the old CK (same visibilityTimeout),
// the write already overwrites the old record in RocksDB, skip delete
// to avoid removing the newly written record.
if (skipWrite || ckRecord.getVisibilityTimeout() != ackRecord.getVisibilityTimeout()) {
this.popConsumerStore.deleteRecords(Collections.singletonList(ackRecord));
}
}

// Use broker escape bridge to support remote read
Expand Down
Loading