Skip to content

[ISSUE #10772] Skip malformed current broker data #10773

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
Aias00 wants to merge 1 commit into
base: develop
Choose a base branch
from
+32 −2
Open

[ISSUE #10772] Skip malformed current broker data #10773

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion proxy/src/main/java/org/apache/rocketmq/proxy/service/admin/DefaultAdminService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,13 @@ public boolean createTopicOnBroker(String topic, int wQueueNum, int rQueueNum, L
Set<String> curBrokerAddr = new HashSet<>();
if (curBrokerDataList != null) {
for (BrokerData brokerData : curBrokerDataList) {
curBrokerAddr.add(brokerData.getBrokerAddrs().get(MixAll.MASTER_ID));
if (brokerData == null || brokerData.getBrokerAddrs() == null) {
continue;
}
String addr = brokerData.getBrokerAddrs().get(MixAll.MASTER_ID);
if (addr != null) {
curBrokerAddr.add(addr);
}
}
}

Expand Down
26 changes: 25 additions & 1 deletion proxy/src/test/java/org/apache/rocketmq/proxy/service/admin/DefaultAdminServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.rocketmq.proxy.service.admin;

import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
Expand Down Expand Up @@ -87,6 +88,29 @@ public void testCreateTopic() throws Exception {
assertEquals(8, topicConfigArgumentCaptor.getValue().getReadQueueNums());
}

@Test
public void testCreateTopicOnBrokerSkipsMalformedCurrentBrokerData() throws Exception {
BrokerData malformedBrokerData = new BrokerData();

ArgumentCaptor<String> addrArgumentCaptor = ArgumentCaptor.forClass(String.class);
ArgumentCaptor<TopicConfig> topicConfigArgumentCaptor = ArgumentCaptor.forClass(TopicConfig.class);
doNothing().when(mqClientAPIExt)
.createTopic(addrArgumentCaptor.capture(), anyString(), topicConfigArgumentCaptor.capture(), anyLong());

assertTrue(defaultAdminService.createTopicOnBroker(
"createTopic",
7,
8,
Collections.singletonList(malformedBrokerData),
createTopicRouteData(1).getBrokerDatas(),
false,
0
));

assertEquals("127.0.0.1:10911", addrArgumentCaptor.getValue());
assertEquals("createTopic", topicConfigArgumentCaptor.getValue().getTopicName());
}
Comment on lines +110 to +112

private TopicRouteData createTopicRouteData(int brokerNum) {
TopicRouteData topicRouteData = new TopicRouteData();
for (int i = 0; i < brokerNum; i++) {
Expand All @@ -100,4 +124,4 @@ private TopicRouteData createTopicRouteData(int brokerNum) {
}
return topicRouteData;
}
}
}
Loading