Skip to content

[ISSUE #10071] Fix PopLiteLongPollingService#cleanUnusedResource #10072

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
RongtongJin merged 1 commit into from
Feb 5, 2026
+3 −6
Merged

[ISSUE #10071] Fix PopLiteLongPollingService#cleanUnusedResource #10072

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
9 changes: 3 additions & 6 deletions broker/src/main/java/org/apache/rocketmq/broker/longpolling/PopLiteLongPollingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.common.ServiceThread;
import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.common.lite.LiteSubscription;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
import org.apache.rocketmq.remoting.netty.NettyRemotingAbstract;
Expand Down Expand Up @@ -126,7 +125,7 @@ public void run() {
}

// clean unused
if (lastCleanTime == 0 || System.currentTimeMillis() - lastCleanTime > 5 * 60 * 1000) {
if (lastCleanTime == 0 || System.currentTimeMillis() - lastCleanTime > 3 * 60 * 1000) {
cleanUnusedResource();
}
} catch (Throwable e) {
Expand Down Expand Up @@ -247,10 +246,8 @@ public PollingResult polling(final ChannelHandlerContext ctx, RemotingCommand re
private void cleanUnusedResource() {
try {
pollingMap.entrySet().removeIf(entry -> {
String clientId = entry.getKey(); // see getPollingKey()
LiteSubscription subscription = brokerController.getLiteSubscriptionRegistry().getLiteSubscription(clientId);
if (null == subscription || CollectionUtils.isEmpty(subscription.getLiteTopicSet())) {
LOGGER.info("clean polling structure of {}", clientId);
if (CollectionUtils.isEmpty(entry.getValue())) {
LOGGER.info("clean polling structure of {}", entry.getKey()); // see getPollingKey()
return true;
}
return false;
Expand Down
Loading