Skip to content
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

Jump to bottom

[ISSUE #8957] Remove excess traffic and fix cache inconsistencies #8958

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

[ISSUE #8957] Remove excess traffic and fix cache inconsistencies #8958

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f215c0
Remove unnecessary network communication when rebalance in POP
Nov 20, 2024
3cc1965
Remove unnecessary network communication when rebalance in POP
Nov 20, 2024
6c4cf37
Merge branch 'apache:develop' into opti_rb
3424672656 Nov 20, 2024
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
53 changes: 1 addition & 52 deletions client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.apache.rocketmq.common.message.MessageQueue;
import org.apache.rocketmq.common.message.MessageQueueAssignment;
import org.apache.rocketmq.common.message.MessageRequestMode;
import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
import org.apache.rocketmq.remoting.protocol.body.LockBatchRequestBody;
import org.apache.rocketmq.remoting.protocol.body.UnlockBatchRequestBody;
import org.apache.rocketmq.remoting.protocol.filter.FilterAPI;
Expand All @@ -60,12 +59,8 @@ public abstract class RebalanceImpl {
protected MessageModel messageModel;
protected AllocateMessageQueueStrategy allocateMessageQueueStrategy;
protected MQClientInstance mQClientFactory;
private static final int TIMEOUT_CHECK_TIMES = 3;
private static final int QUERY_ASSIGNMENT_TIMEOUT = 3000;

private Map<String, String> topicBrokerRebalance = new ConcurrentHashMap<>();
private Map<String, String> topicClientRebalance = new ConcurrentHashMap<>();

public RebalanceImpl(String consumerGroup, MessageModel messageModel,
AllocateMessageQueueStrategy allocateMessageQueueStrategy,
MQClientInstance mQClientFactory) {
Expand Down Expand Up @@ -241,7 +236,7 @@ public boolean doRebalance(final boolean isOrder) {
for (final Map.Entry<String, SubscriptionData> entry : subTable.entrySet()) {
final String topic = entry.getKey();
try {
if (!clientRebalance(topic) && tryQueryAssignment(topic)) {
if (!clientRebalance(topic)) {
boolean result = this.getRebalanceResultFromBroker(topic, isOrder);
if (!result) {
balanced = false;
Expand All @@ -266,38 +261,6 @@ public boolean doRebalance(final boolean isOrder) {
return balanced;
}

private boolean tryQueryAssignment(String topic) {
if (topicClientRebalance.containsKey(topic)) {
return false;
}

if (topicBrokerRebalance.containsKey(topic)) {
return true;
}
String strategyName = allocateMessageQueueStrategy != null ? allocateMessageQueueStrategy.getName() : null;
int retryTimes = 0;
while (retryTimes++ < TIMEOUT_CHECK_TIMES) {
try {
Set<MessageQueueAssignment> resultSet = mQClientFactory.queryAssignment(topic, consumerGroup,
strategyName, messageModel, QUERY_ASSIGNMENT_TIMEOUT / TIMEOUT_CHECK_TIMES * retryTimes);
topicBrokerRebalance.put(topic, topic);
return true;
} catch (Throwable t) {
if (!(t instanceof RemotingTimeoutException)) {
log.error("tryQueryAssignment error.", t);
topicClientRebalance.put(topic, topic);
return false;
}
}
}
if (retryTimes >= TIMEOUT_CHECK_TIMES) {
// if never success before and timeout exceed TIMEOUT_CHECK_TIMES, force client rebalance
topicClientRebalance.put(topic, topic);
return false;
}
return true;
}

public ConcurrentMap<String, SubscriptionData> getSubscriptionInner() {
return subscriptionInner;
}
Expand Down Expand Up @@ -460,20 +423,6 @@ private void truncateMessageQueueNotMyTopic() {
}
}
}

Iterator<Map.Entry<String, String>> clientIter = topicClientRebalance.entrySet().iterator();
while (clientIter.hasNext()) {
if (!subTable.containsKey(clientIter.next().getKey())) {
clientIter.remove();
}
}

Iterator<Map.Entry<String, String>> brokerIter = topicBrokerRebalance.entrySet().iterator();
while (brokerIter.hasNext()) {
if (!subTable.containsKey(brokerIter.next().getKey())) {
brokerIter.remove();
}
}
}

private boolean updateProcessQueueTableInRebalance(final String topic, final Set<MessageQueue> mqSet,
Expand Down
Loading