Skip to content

[ISSUE #9443] Fix add wrong value to topicGroupTable in ConsumerManager #9444

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
lizhimins merged 2 commits into from
Jun 3, 2025
Merged

[ISSUE #9443] Fix add wrong value to topicGroupTable in ConsumerManager #9444

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
e715f6f
[ISSUE #9443] Fix add value error of topicGroupTable in ConsumerManager
yx9o Jun 1, 2025
9c2f2ce
Update test
yx9o Jun 2, 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
2 changes: 1 addition & 1 deletion broker/src/main/java/org/apache/rocketmq/broker/client/ConsumerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ public boolean registerConsumerWithoutSub(final String group, final ClientChanne
Set<String> prev = this.topicGroupTable.putIfAbsent(subscriptionData.getTopic(), tmp);
groups = prev != null ? prev : tmp;
}
groups.add(subscriptionData.getTopic());
groups.add(group);
}

boolean updateChannelRst = consumerGroupInfo.updateChannel(clientChannelInfo, consumeType, messageModel, consumeFromWhere);
Expand Down
25 changes: 23 additions & 2 deletions broker/src/test/java/org/apache/rocketmq/broker/client/ConsumerManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.util.HashSet;
import java.util.Set;

import static org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType.CONSUME_PASSIVELY;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
Expand Down Expand Up @@ -115,7 +116,7 @@ public void registerConsumerTest() {
final Set<SubscriptionData> subList = new HashSet<>();
SubscriptionData subscriptionData = new SubscriptionData(TOPIC, "*");
subList.add(subscriptionData);
consumerManager.registerConsumer(GROUP, clientChannelInfo, ConsumeType.CONSUME_PASSIVELY,
consumerManager.registerConsumer(GROUP, clientChannelInfo, CONSUME_PASSIVELY,
MessageModel.BROADCASTING, ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET, subList, true);
verify(consumerManager, never()).callConsumerIdsChangeListener(eq(ConsumerGroupEvent.CHANGE), any(), any());
assertThat(consumerManager.getConsumerTable().get(GROUP)).isNotNull();
Expand Down Expand Up @@ -195,7 +196,7 @@ private void register() {
final Set<SubscriptionData> subList = new HashSet<>();
SubscriptionData subscriptionData = new SubscriptionData(TOPIC, "*");
subList.add(subscriptionData);
consumerManager.registerConsumer(GROUP, clientChannelInfo, ConsumeType.CONSUME_PASSIVELY,
consumerManager.registerConsumer(GROUP, clientChannelInfo, CONSUME_PASSIVELY,
MessageModel.BROADCASTING, ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET, subList, true);
}

Expand All @@ -210,4 +211,24 @@ public void removeExpireConsumerGroupInfo() {
assertThat(consumerManager.findSubscriptionData(GROUP, TOPIC)).isNull();
assertThat(consumerManager.findSubscriptionData(GROUP, TOPIC + "_1")).isNotNull();
}

@Test
public void testRegisterConsumerWithoutSub() {
ConsumerGroupInfo groupInfo = new ConsumerGroupInfo(GROUP, CONSUME_PASSIVELY,
MessageModel.CLUSTERING, ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET);
SubscriptionData subscriptionData = new SubscriptionData(TOPIC, "*");
groupInfo.getSubscriptionTable().put(TOPIC, subscriptionData);
consumerManager.getConsumerTable().put(GROUP, groupInfo);

consumerManager.registerConsumerWithoutSub(GROUP,
clientChannelInfo,
CONSUME_PASSIVELY,
MessageModel.CLUSTERING,
ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET,
true);

Set<String> actual = consumerManager.queryTopicConsumeByWho(TOPIC);
assertThat(actual).contains(GROUP);
assertThat(actual).doesNotContain(TOPIC);
}
}
Loading