Skip to content

[ISSUE #9369] Fix reset offset commit pull offset when use pop consumer service #9370

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 28, 2025
Merged

[ISSUE #9369] Fix reset offset commit pull offset when use pop consumer service #9370

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
4 changes: 0 additions & 4 deletions broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,10 +1543,6 @@ protected void shutdownBasicService() {
this.consumerFilterManager.persist();
}

if (this.consumerOrderInfoManager != null) {
this.consumerOrderInfoManager.persist();
}

if (this.scheduleMessageService != null) {
this.scheduleMessageService.persist();
this.scheduleMessageService.shutdown();
Expand Down
4 changes: 4 additions & 0 deletions broker/src/main/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,10 @@ public long queryPullOffset(final String group, final String topic, final int qu
return offset;
}

public void clearPullOffset(final String group, final String topic) {
this.pullOffsetTable.remove(topic + TOPIC_GROUP_SEPARATOR + group);
}

@Override
public String encode() {
return this.encode(false);
Expand Down
3 changes: 1 addition & 2 deletions 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 @@ -2262,8 +2262,7 @@ private RemotingCommand resetOffsetInner(String topic, String group, int queueId
}
if (brokerController.getBrokerConfig().isPopConsumerKVServiceEnable()) {
brokerController.getPopConsumerService().clearCache(group, topic, entry.getKey());
brokerController.getConsumerOffsetManager().commitPullOffset(
"ResetOffsetInner", group, topic, entry.getKey(), entry.getValue());
brokerController.getConsumerOffsetManager().clearPullOffset(group, topic);
}
body.getOffsetTable().put(new MessageQueue(topic, brokerName, entry.getKey()), entry.getValue());
}
Expand Down
4 changes: 4 additions & 0 deletions broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ public void removeOffsetByGroupTest() {
consumerOffsetManager.commitPullOffset("Pull", group, topic, 0, 100);
consumerOffsetManager.removeOffset(group);
Assert.assertFalse(consumerOffsetManager.getOffsetTable().containsKey(topic + TOPIC_GROUP_SEPARATOR + group));

consumerOffsetManager.commitPullOffset("Pull", group, topic, 0, 100);
consumerOffsetManager.clearPullOffset(group, topic);
Assert.assertEquals(-1L, consumerOffsetManager.queryPullOffset(group, topic, 0));
}

@Test
Expand Down
Loading