Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public CompletableFuture<QueryRouteResponse> queryRoute(ProxyContext ctx, QueryR
String brokerName = queueData.getBrokerName();
Map<Long, Broker> brokerIdMap = brokerMap.get(brokerName);
if (brokerIdMap == null) {
break;
continue;
}
for (Broker broker : brokerIdMap.values()) {
messageQueueList.addAll(this.genMessageQueueFromQueueData(queueData, request.getTopic(), topicMessageType, broker));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,29 @@ public void testQueryRoute() throws Throwable {
}
}

@Test
public void testQueryRouteSkipsMissingBrokerAndContinues() throws Throwable {
when(this.messagingProcessor.getTopicRouteDataForProxy(any(), any(), anyString()))
.thenReturn(createProxyTopicRouteDataWithMissingBrokerBeforeValidBroker());
when(this.messagingProcessor.getMetadataService().getTopicMessageType(any(), anyString()))
.thenReturn(TopicMessageType.NORMAL);

QueryRouteResponse response = this.routeActivity.queryRoute(
createContext(),
QueryRouteRequest.newBuilder()
.setEndpoints(grpcEndpoints)
.setTopic(Resource.newBuilder().setName(TOPIC).build())
.build()
).get();

assertEquals(Code.OK, response.getStatus().getCode());
assertEquals(4, response.getMessageQueuesCount());
for (MessageQueue messageQueue : response.getMessageQueuesList()) {
assertEquals(BROKER_NAME, messageQueue.getBroker().getName());
assertEquals(grpcEndpoints, messageQueue.getBroker().getEndpoints());
}
}

@Test
public void testQueryRouteTopicExist() throws Throwable {
when(this.messagingProcessor.getTopicRouteDataForProxy(any(), any(), anyString()))
Expand Down Expand Up @@ -226,6 +249,14 @@ private static ProxyTopicRouteData createProxyTopicRouteData(int r, int w, int p
return proxyTopicRouteData;
}

private static ProxyTopicRouteData createProxyTopicRouteDataWithMissingBrokerBeforeValidBroker() {
ProxyTopicRouteData proxyTopicRouteData = createProxyTopicRouteData(2, 2, PermName.PERM_READ | PermName.PERM_WRITE);
QueueData missingBrokerQueueData = createQueueData(2, 2, PermName.PERM_READ | PermName.PERM_WRITE);
missingBrokerQueueData.setBrokerName("missingBrokerName");
proxyTopicRouteData.getQueueDatas().add(0, missingBrokerQueueData);
return proxyTopicRouteData;
}

@Test
public void testGenPartitionFromQueueData() throws Exception {
// test queueData with 8 read queues, 8 write queues, and rw permission, expect 8 rw queues.
Expand Down
Loading