Skip to content

[ISSUE 9660]send subscriptionData in litePullConsumer #9661

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[ISSUE 9660]send subscriptionData in litePullConsumer #9661

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
093e612
send subscriptionData in litePullConsumer
1782935682 Sep 3, 2025
9bcfe37
Merge branch 'develop' into fix/9660
1782935682 Sep 5, 2025
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
22 changes: 15 additions & 7 deletions ...t/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultLitePullConsumerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
import org.apache.rocketmq.common.message.MessageExt;
import org.apache.rocketmq.common.message.MessageQueue;
import org.apache.rocketmq.common.sysflag.PullSysFlag;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
import org.apache.rocketmq.remoting.RPCHook;
import org.apache.rocketmq.remoting.exception.RemotingException;
import org.apache.rocketmq.remoting.protocol.NamespaceUtil;
Expand All @@ -73,8 +75,6 @@
import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
import org.apache.rocketmq.logging.org.slf4j.Logger;
import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;

public class DefaultLitePullConsumerImpl implements MQConsumerInner {

Expand Down Expand Up @@ -329,8 +329,8 @@ public synchronized void start() throws MQClientException {

private void initScheduledThreadPoolExecutor() {
this.scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(
this.defaultLitePullConsumer.getPullThreadNums(),
new ThreadFactoryImpl("PullMsgThread-" + this.defaultLitePullConsumer.getConsumerGroup())
this.defaultLitePullConsumer.getPullThreadNums(),
new ThreadFactoryImpl("PullMsgThread-" + this.defaultLitePullConsumer.getConsumerGroup())
);
}

Expand Down Expand Up @@ -912,8 +912,8 @@ public void run() {
scheduledThreadPoolExecutor.schedule(this, PULL_TIME_DELAY_MILLS_WHEN_CACHE_FLOW_CONTROL, TimeUnit.MILLISECONDS);
if ((consumeRequestFlowControlTimes++ % 1000) == 0) {
log.warn("The consume request count exceeds threshold {}, so do flow control, consume request count={}, flowControlTimes={}",
(int)Math.ceil((double)defaultLitePullConsumer.getPullThresholdForAll() / defaultLitePullConsumer.getPullBatchSize()),
consumeRequestCache.size(), consumeRequestFlowControlTimes);
(int) Math.ceil((double) defaultLitePullConsumer.getPullThresholdForAll() / defaultLitePullConsumer.getPullBatchSize()),
consumeRequestCache.size(), consumeRequestFlowControlTimes);
}
return;
}
Expand Down Expand Up @@ -1122,7 +1122,15 @@ public Set<SubscriptionData> subscriptions() {
Set<SubscriptionData> subSet = new HashSet<>();

subSet.addAll(this.rebalanceImpl.getSubscriptionInner().values());

if (!topicToSubExpression.isEmpty()) {
for (Map.Entry<String, String> entry : topicToSubExpression.entrySet()) {
try {
subSet.add(FilterAPI.buildSubscriptionData(entry.getKey(), entry.getValue()));
} catch (Exception e) {
log.warn("BuildSubscriptionData error, topic=[{}], subString=[{}] ", entry.getKey(), entry.getValue(), e);
}
}
}
return subSet;
}

Expand Down
Loading