diff --git a/broker/src/main/java/org/apache/rocketmq/broker/pop/PopConsumerService.java b/broker/src/main/java/org/apache/rocketmq/broker/pop/PopConsumerService.java index 55a347b89a5..7d80014ece2 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/pop/PopConsumerService.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/pop/PopConsumerService.java @@ -555,16 +555,9 @@ public CompletableFuture 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); } } diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java index 73aaa69e74a..c88d4e5ad2f 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java @@ -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());