Skip to content

[ISSUE #10181] Remove lock when resetting offset in PopConsumerService #10250

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

Merged
lizhimins merged 1 commit into from
Apr 10, 2026
+2 −10
Merged

[ISSUE #10181] Remove lock when resetting offset in PopConsumerService #10250

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
11 changes: 2 additions & 9 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 @@ -555,16 +555,9 @@ public CompletableFuture<Boolean> revive(PopConsumerRecord record) {
});
}

@SuppressWarnings("StatementWithEmptyBody")
public void clearCache(String groupId, String topicId, int queueId) {
while (!consumerLockService.tryLock(groupId, topicId)) {
}
try {
if (popConsumerCache != null) {
popConsumerCache.removeRecords(groupId, topicId, queueId);
}
} finally {
consumerLockService.unlock(groupId, topicId);
if (popConsumerCache != null) {
popConsumerCache.removeRecords(groupId, topicId, queueId);
}
}

Expand Down
1 change: 0 additions & 1 deletion broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2183,7 +2183,6 @@ private RemotingCommand resetOffsetInner(String topic, String group, int queueId
brokerController.getPopInflightMessageCounter().clearInFlightMessageNum(topic, group, entry.getKey());
}
if (brokerController.getBrokerConfig().isPopConsumerKVServiceEnable()) {
brokerController.getPopConsumerService().clearCache(group, topic, entry.getKey());
brokerController.getConsumerOffsetManager().clearPullOffset(group, topic);
}
body.getOffsetTable().put(new MessageQueue(topic, brokerName, entry.getKey()), entry.getValue());
Expand Down
Loading