Skip to content

[ISSUE #10405] Fix orderly consumer retry message routed to wrong broker via TBW102 fallback #10408

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
qianye1001 wants to merge 2 commits into
base: develop
Choose a base branch
from
+74 −2
Open

[ISSUE #10405] Fix orderly consumer retry message routed to wrong broker via TBW102 fallback #10408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
285ebfa
[ISSUE #10405] Fix orderly consumer retry message routed to wrong bro…
qianye1001 May 29, 2026
3692d1b
fix: add null check for topicSubscribeInfoTable in trySendToTopicBroker
qianye1001 May 29, 2026
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
38 changes: 37 additions & 1 deletion .../src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
Expand Down Expand Up @@ -390,7 +392,9 @@ public boolean sendMessageBack(final MessageExt msg) {
MessageAccessor.clearProperty(newMsg, MessageConst.PROPERTY_TRANSACTION_PREPARED);
newMsg.setDelayTimeLevel(3 + msg.getReconsumeTimes());

this.defaultMQPushConsumerImpl.getmQClientFactory().getDefaultMQProducer().send(newMsg);
if (!trySendToTopicBroker(newMsg, msg)) {
this.defaultMQPushConsumerImpl.getmQClientFactory().getDefaultMQProducer().send(newMsg);
}
return true;
} catch (Exception e) {
log.error("sendMessageBack exception, group: " + this.consumerGroup + " msg: " + msg.toString(), e);
Expand All @@ -399,6 +403,38 @@ public boolean sendMessageBack(final MessageExt msg) {
return false;
}

private boolean trySendToTopicBroker(Message retryMsg, MessageExt originalMsg) {
java.util.concurrent.ConcurrentMap<String, Set<MessageQueue>> table =
this.defaultMQPushConsumerImpl.getRebalanceImpl().getTopicSubscribeInfoTable();
if (table == null) {
return false;
}
Set<MessageQueue> mqs = table.get(originalMsg.getTopic());
if (mqs == null || mqs.isEmpty()) {
return false;
}

Set<String> brokerNames = new LinkedHashSet<>();
String originalBroker = originalMsg.getBrokerName();
if (originalBroker != null) {
brokerNames.add(originalBroker);
}
for (MessageQueue mq : mqs) {
brokerNames.add(mq.getBrokerName());
}

for (String brokerName : brokerNames) {
try {
MessageQueue retryMQ = new MessageQueue(retryMsg.getTopic(), brokerName, 0);
this.defaultMQPushConsumerImpl.getmQClientFactory().getDefaultMQProducer().send(retryMsg, retryMQ);
return true;
} catch (Exception e) {
log.warn("Failed to send retry message to broker {}, trying next", brokerName, e);
}
}
return false;
}

public void resetNamespace(final List<MessageExt> msgs) {
for (MessageExt msg : msgs) {
if (StringUtils.isNotEmpty(this.defaultMQPushConsumer.getNamespace())) {
Expand Down
38 changes: 37 additions & 1 deletion ...c/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessagePopOrderlyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@

import io.netty.util.internal.ConcurrentSet;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
Expand Down Expand Up @@ -304,7 +306,9 @@ public boolean sendMessageBack(final MessageExt msg) {
MessageAccessor.setMaxReconsumeTimes(newMsg, String.valueOf(getMaxReconsumeTimes()));
newMsg.setDelayTimeLevel(3 + msg.getReconsumeTimes());

this.defaultMQPushConsumerImpl.getmQClientFactory().getDefaultMQProducer().send(newMsg);
if (!trySendToTopicBroker(newMsg, msg)) {
this.defaultMQPushConsumerImpl.getmQClientFactory().getDefaultMQProducer().send(newMsg);
}
return true;
} catch (Exception e) {
log.error("sendMessageBack exception, group: " + this.consumerGroup + " msg: " + msg.toString(), e);
Expand All @@ -313,6 +317,38 @@ public boolean sendMessageBack(final MessageExt msg) {
return false;
}

private boolean trySendToTopicBroker(Message retryMsg, MessageExt originalMsg) {
java.util.concurrent.ConcurrentMap<String, Set<MessageQueue>> table =
this.defaultMQPushConsumerImpl.getRebalanceImpl().getTopicSubscribeInfoTable();
if (table == null) {
return false;
}
Set<MessageQueue> mqs = table.get(originalMsg.getTopic());
if (mqs == null || mqs.isEmpty()) {
return false;
}

Set<String> brokerNames = new LinkedHashSet<>();
String originalBroker = originalMsg.getBrokerName();
if (originalBroker != null) {
brokerNames.add(originalBroker);
}
for (MessageQueue mq : mqs) {
brokerNames.add(mq.getBrokerName());
}

for (String brokerName : brokerNames) {
try {
MessageQueue retryMQ = new MessageQueue(retryMsg.getTopic(), brokerName, 0);
this.defaultMQPushConsumerImpl.getmQClientFactory().getDefaultMQProducer().send(retryMsg, retryMQ);
return true;
} catch (Exception e) {
log.warn("Failed to send retry message to broker {}, trying next", brokerName, e);
}
}
return false;
}

public void resetNamespace(final List<MessageExt> msgs) {
for (MessageExt msg : msgs) {
if (StringUtils.isNotEmpty(this.defaultMQPushConsumer.getNamespace())) {
Expand Down
Loading