This is an automated email from the ASF dual-hosted git repository. mmarshall pushed a commit to branch branch-2.9 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit eec0499aed467f8a03f7922706f60682b99d1dc7 Author: Lari Hotari <[email protected]> AuthorDate: Fri Dec 23 16:32:34 2022 +0200 [fix][client] Prevent DNS reverse lookup when physical address is an IP address (#19028) (cherry picked from commit d8569cd4ec6da14f8b2b9338db1ed2f6a3eacf0a) --- .../apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java | 2 +- .../src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java | 2 +- .../java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java index b8e256268ea..3ff0873bdf6 100644 --- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java +++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java @@ -206,7 +206,7 @@ public class AsyncHttpConnector implements Connector { private URI replaceWithNew(InetSocketAddress address, URI uri) { String originalUri = uri.toString(); String newUri = (originalUri.split(":")[0] + "://") - + address.getHostName() + ":" + + address.getHostString() + ":" + address.getPort() + uri.getRawPath(); if (uri.getRawQuery() != null) { diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java index 433f20b3daf..5089de06993 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java @@ -212,7 +212,7 @@ public class ConnectionPool implements AutoCloseable { cnx.setTargetBroker(logicalAddress); } - cnx.setRemoteHostName(physicalAddress.getHostName()); + cnx.setRemoteHostName(physicalAddress.getHostString()); cnx.connectionFuture().thenRun(() -> { if (log.isDebugEnabled()) { diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java index a3f38723f6c..470118bce13 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java @@ -63,7 +63,7 @@ public class PulsarServiceNameResolver implements ServiceNameResolver { @Override public URI resolveHostUri() { InetSocketAddress host = resolveHost(); - String hostUrl = serviceUri.getServiceScheme() + "://" + host.getHostName() + ":" + host.getPort(); + String hostUrl = serviceUri.getServiceScheme() + "://" + host.getHostString() + ":" + host.getPort(); return URI.create(hostUrl); }
