Skip to content

[ISSUE #9630] Fixed Remoting client port, not gRPC port #9631

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

[ISSUE #9630] Fixed Remoting client port, not gRPC port #9631

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
7 changes: 6 additions & 1 deletion proxy/src/main/java/org/apache/rocketmq/proxy/service/route/LocalTopicRouteService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ public ProxyTopicRouteData getTopicRouteForProxy(ProxyContext ctx, List<Address>
String topicName) throws Exception {
MessageQueueView messageQueueView = getAllMessageQueueView(ctx, topicName);
TopicRouteData topicRouteData = messageQueueView.getTopicRouteData();
return new ProxyTopicRouteData(topicRouteData, grpcPort);

if (requestHostAndPortList != null && !requestHostAndPortList.isEmpty()) {
return new ProxyTopicRouteData(topicRouteData, requestHostAndPortList);
} else {
return new ProxyTopicRouteData(topicRouteData, grpcPort);
}
}

@Override
Expand Down
19 changes: 19 additions & 0 deletions proxy/src/test/java/org/apache/rocketmq/proxy/service/route/LocalTopicRouteServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.google.common.net.HostAndPort;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.rocketmq.broker.BrokerController;
Expand Down Expand Up @@ -102,4 +103,22 @@ public void testGetTopicRouteForProxy() throws Throwable {
ConfigurationManager.getProxyConfig().getGrpcServerPort()))),
proxyTopicRouteData.getBrokerDatas().get(0).getBrokerAddrs().get(MixAll.MASTER_ID));
}

@Test
public void testGetTopicRouteForProxyWithRemotingClient() throws Throwable {
ProxyContext ctx = ProxyContext.create();

List<Address> remotingAddressList = Lists.newArrayList(
new Address(Address.AddressScheme.IPv4, HostAndPort.fromParts(
HostAndPort.fromString(BROKER_ADDR).getHost(),
ConfigurationManager.getProxyConfig().getRemotingListenPort()))
);

ProxyTopicRouteData proxyTopicRouteData = this.topicRouteService.getTopicRouteForProxy(ctx, remotingAddressList, TOPIC);

assertEquals(1, proxyTopicRouteData.getBrokerDatas().size());
assertEquals(
remotingAddressList,
proxyTopicRouteData.getBrokerDatas().get(0).getBrokerAddrs().get(MixAll.MASTER_ID));
}
}