lollipopjin commented on code in PR #9087: URL: https://github.com/apache/rocketmq/pull/9087#discussion_r1899496705
########## broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java: ########## @@ -2187,9 +2187,13 @@ private RemotingCommand resetOffsetInner(String topic, String group, int queueId ResetOffsetBody body = new ResetOffsetBody(); String brokerName = brokerController.getBrokerConfig().getBrokerName(); for (Map.Entry<Integer, Long> entry : queueOffsetMap.entrySet()) { - brokerController.getPopInflightMessageCounter().clearInFlightMessageNum(topic, group, entry.getKey()); + if (brokerController.getPopInflightMessageCounter() != null) { + brokerController.getPopInflightMessageCounter().clearInFlightMessageNum(topic, group, entry.getKey()); + } if (brokerController.getBrokerConfig().isPopConsumerKVServiceEnable()) { - brokerController.getPopConsumerService().clearCache(group, topic, queueId); + brokerController.getPopConsumerService().clearCache(group, topic, entry.getKey()); + brokerController.getConsumerOffsetManager().commitPullOffset( Review Comment: Notice: here if we use the same consumer group to do pull and pop at the same time, they both commit the pull offset, May be pop requests may miss some messages here. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@rocketmq.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org