From 51e465d3a6f537900e63b1358fcddcdfaf870f86 Mon Sep 17 00:00:00 2001 From: qianye Date: Mon, 15 Sep 2025 15:19:18 +0800 Subject: [PATCH 1/2] fix --- .../org/apache/rocketmq/broker/offset/ConsumerOffsetManager.java | 1 + 1 file changed, 1 insertion(+) 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 index a6cd9ad987d..2bec1745cb2 100644 --- 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,7 @@ public void cleanOffsetByTopic(String topic) { if (arrays.length == 2 && topic.equals(arrays[0])) { it.remove(); removeConsumerOffset(topicAtGroup); + pullOffsetTable.remove(topicAtGroup); LOG.warn("Clean topic's offset, {}, {}", topicAtGroup, next.getValue()); } } From 0be4ec3ce1cd574e7d4873f192c0434376a6a4f3 Mon Sep 17 00:00:00 2001 From: qianye Date: Mon, 15 Sep 2025 15:42:43 +0800 Subject: [PATCH 2/2] fix --- .../org/apache/rocketmq/broker/offset/ConsumerOffsetManager.java | 1 + 1 file changed, 1 insertion(+) 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 index 2bec1745cb2..e1e1cb4b029 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManager.java @@ -98,6 +98,7 @@ public void cleanOffsetByTopic(String topic) { it.remove(); removeConsumerOffset(topicAtGroup); pullOffsetTable.remove(topicAtGroup); + resetOffsetTable.remove(topicAtGroup); LOG.warn("Clean topic's offset, {}, {}", topicAtGroup, next.getValue()); } }