[ISSUE #9703] Remove pull offset and reset offset when deleting topic (#9704)

qianye1001 · web-flow · commit d0e31a2b341a · 2025-09-16T10:49:34.000+08:00
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManager.java b/broker/src/main/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManager.java
@@ -97,6 +97,8 @@ public void cleanOffsetByTopic(String topic) {
                 if (arrays.length == 2 && topic.equals(arrays[0])) {
                     it.remove();
                     removeConsumerOffset(topicAtGroup);
+                    pullOffsetTable.remove(topicAtGroup);
+                    resetOffsetTable.remove(topicAtGroup);
                     LOG.warn("Clean topic's offset, {}, {}", topicAtGroup, next.getValue());
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,8 @@ public void cleanOffsetByTopic(String topic) {`
`97`	`97`	`if (arrays.length == 2 && topic.equals(arrays[0])) {`
`98`	`98`	`it.remove();`
`99`	`99`	`removeConsumerOffset(topicAtGroup);`
	`100`	`+ pullOffsetTable.remove(topicAtGroup);`
	`101`	`+ resetOffsetTable.remove(topicAtGroup);`
`100`	`102`	`LOG.warn("Clean topic's offset, {}, {}", topicAtGroup, next.getValue());`
`101`	`103`	`}`
`102`	`104`	`}`