(pulsar) branch master updated: Enabling DNS retryOnTimeout with TCP in DnsNameResolver (#23590)

[lhotari]

This is an automated email from the ASF dual-hosted git repository.

lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 5d924bfb451 Enabling DNS retryOnTimeout with TCP in DnsNameResolver 
(#23590)
5d924bfb451 is described below

commit 5d924bfb451bccdad0c1dc9a22c6dde49d65a47d
Author: grayson <916028...@qq.com>
AuthorDate: Thu Nov 14 05:07:01 2024 +0800

    Enabling DNS retryOnTimeout with TCP in DnsNameResolver (#23590)
---
 .../src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java   | 4 +++-
 .../src/main/java/org/apache/pulsar/proxy/server/ProxyService.java    | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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 9be734bee61..1eb603e28f5 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
@@ -188,7 +188,9 @@ public class ConnectionPool implements AutoCloseable {
     private static AddressResolver<InetSocketAddress> 
createAddressResolver(ClientConfigurationData conf,
                                                                             
EventLoopGroup eventLoopGroup) {
         DnsNameResolverBuilder dnsNameResolverBuilder = new 
DnsNameResolverBuilder()
-                
.traceEnabled(true).channelType(EventLoopUtil.getDatagramChannelClass(eventLoopGroup));
+                .traceEnabled(true)
+                
.channelType(EventLoopUtil.getDatagramChannelClass(eventLoopGroup))
+                
.socketChannelType(EventLoopUtil.getClientSocketChannelClass(eventLoopGroup), 
true);
         if (conf.getDnsLookupBindAddress() != null) {
             InetSocketAddress addr = new 
InetSocketAddress(conf.getDnsLookupBindAddress(),
                     conf.getDnsLookupBindPort());
diff --git 
a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java 
b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
index 4ee15fd7124..11afb68398e 100644
--- 
a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
+++ 
b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
@@ -179,7 +179,8 @@ public class ProxyService implements Closeable {
         this.authenticationService = authenticationService;
 
         DnsNameResolverBuilder dnsNameResolverBuilder = new 
DnsNameResolverBuilder()
-                
.channelType(EventLoopUtil.getDatagramChannelClass(workerGroup));
+                
.channelType(EventLoopUtil.getDatagramChannelClass(workerGroup))
+                
.socketChannelType(EventLoopUtil.getClientSocketChannelClass(workerGroup), 
true);
         DnsResolverUtil.applyJdkDnsCacheSettings(dnsNameResolverBuilder);
 
         dnsAddressResolverGroup = new 
DnsAddressResolverGroup(dnsNameResolverBuilder);