Make Socket options configurable, close AsyncHttpClient#1086

Author: slandelle

client/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java

@@ -257,6 +257,16 @@ public interface AsyncHttpClientConfig {
 
     boolean isValidateResponseHeaders();
 
+    boolean isTcpNoDelay();
+
+    boolean isSoReuseAddress();
+
+    int getSoLinger();
+
+    int getSoSndBuf();
+
+    int getSoRcvBuf();
+
     boolean isUsePooledMemory();
 
     interface AdditionalChannelInitializer {

client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClientConfig.java

@@ -119,6 +119,11 @@ public class DefaultAsyncHttpClientConfig implements AsyncHttpClientConfig {
     private final EventLoopGroup eventLoopGroup;
     private final boolean useNativeTransport;
     private final boolean usePooledMemory;
+    private final boolean tcpNoDelay;
+    private final boolean soReuseAddress;
+    private final int soLinger;
+    private final int soSndBuf;
+    private final int soRcvBuf;
     private final Timer nettyTimer;
     private final ThreadFactory threadFactory;
     private final AdditionalChannelInitializer httpAdditionalChannelInitializer;
@@ -172,6 +177,13 @@ private DefaultAsyncHttpClientConfig(//
             List<ResponseFilter> responseFilters,//
             List<IOExceptionFilter> ioExceptionFilters,//
 
+            // tuning
+            boolean tcpNoDelay,//
+            boolean soReuseAddress,//
+            int soLinger, //
+            int soSndBuf, //
+            int soRcvBuf, //
+
             // internals
             String threadPoolName,//
             int httpClientCodecMaxInitialLineLength,//
@@ -236,6 +248,13 @@ private DefaultAsyncHttpClientConfig(//
         this.responseFilters = responseFilters;
         this.ioExceptionFilters = ioExceptionFilters;
 
+        // tuning
+        this.tcpNoDelay = tcpNoDelay;
+        this.soReuseAddress = soReuseAddress;
+        this.soLinger = soLinger;
+        this.soSndBuf = soSndBuf;
+        this.soRcvBuf = soRcvBuf;
+
         // internals
         this.threadPoolName = threadPoolName;
         this.httpClientCodecMaxInitialLineLength = httpClientCodecMaxInitialLineLength;
@@ -446,6 +465,32 @@ public List<IOExceptionFilter> getIoExceptionFilters() {
         return ioExceptionFilters;
     }
 
+    // tuning
+    @Override
+    public boolean isTcpNoDelay() {
+        return tcpNoDelay;
+    }
+
+    @Override
+    public boolean isSoReuseAddress() {
+        return soReuseAddress;
+    }
+
+    @Override
+    public int getSoLinger() {
+        return soLinger;
+    }
+
+    @Override
+    public int getSoSndBuf() {
+        return soSndBuf;
+    }
+
+    @Override
+    public int getSoRcvBuf() {
+        return soRcvBuf;
+    }
+
     // internals
     @Override
     public String getThreadPoolName() {
@@ -580,6 +625,13 @@ public static class Builder {
         private final List<ResponseFilter> responseFilters = new LinkedList<>();
         private final List<IOExceptionFilter> ioExceptionFilters = new LinkedList<>();
 
+        // tuning
+        private boolean tcpNoDelay = defaultTcpNoDelay();
+        private boolean soReuseAddress = defaultSoReuseAddress();
+        private int soLinger = defaultSoLinger();
+        private int soSndBuf = defaultSoSndBuf();
+        private int soRcvBuf = defaultSoRcvBuf();
+
         // internals
         private String threadPoolName = defaultThreadPoolName();
         private int httpClientCodecMaxInitialLineLength = defaultHttpClientCodecMaxInitialLineLength();
@@ -646,6 +698,13 @@ public Builder(AsyncHttpClientConfig config) {
             responseFilters.addAll(config.getResponseFilters());
             ioExceptionFilters.addAll(config.getIoExceptionFilters());
 
+            // tuning
+            tcpNoDelay = config.isTcpNoDelay();
+            soReuseAddress = config.isSoReuseAddress();
+            soLinger = config.getSoLinger();
+            soSndBuf = config.getSoSndBuf();
+            soRcvBuf = config.getSoRcvBuf();
+
             // internals
             threadPoolName = config.getThreadPoolName();
             httpClientCodecMaxInitialLineLength = config.getHttpClientCodecMaxInitialLineLength();
@@ -890,6 +949,32 @@ public Builder removeIOExceptionFilter(IOExceptionFilter ioExceptionFilter) {
             return this;
         }
 
+        // tuning
+        public Builder setTcpNoDelay(boolean tcpNoDelay) {
+            this.tcpNoDelay = tcpNoDelay;
+            return this;
+        }
+
+        public Builder setSoReuseAddress(boolean soReuseAddress) {
+            this.soReuseAddress = soReuseAddress;
+            return this;
+        }
+
+        public Builder setSoLinger(int soLinger) {
+            this.soLinger = soLinger;
+            return this;
+        }
+
+        public Builder setSoSndBuf(int soSndBuf) {
+            this.soSndBuf = soSndBuf;
+            return this;
+        }
+
+        public Builder setSoRcvBuf(int soRcvBuf) {
+            this.soRcvBuf = soRcvBuf;
+            return this;
+        }
+
         // internals
         public Builder setThreadPoolName(String threadPoolName) {
             this.threadPoolName = threadPoolName;
@@ -1024,6 +1109,11 @@ public DefaultAsyncHttpClientConfig build() {
                     requestFilters.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(requestFilters), //
                     responseFilters.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(responseFilters),//
                     ioExceptionFilters.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(ioExceptionFilters),//
+                    tcpNoDelay, //
+                    soReuseAddress, //
+                    soLinger, //
+                    soSndBuf, //
+                    soRcvBuf, //
                     threadPoolName, //
                     httpClientCodecMaxInitialLineLength, //
                     httpClientCodecMaxHeaderSize, //

client/src/main/java/org/asynchttpclient/config/AsyncHttpClientConfigDefaults.java

@@ -115,6 +115,26 @@ public static int defaultSslSessionTimeout() {
         return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + "sslSessionTimeout");
     }
 
+    public static boolean defaultTcpNoDelay() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getBoolean(ASYNC_CLIENT_CONFIG_ROOT + "tcpNoDelay");
+    }
+
+    public static boolean defaultSoReuseAddress() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getBoolean(ASYNC_CLIENT_CONFIG_ROOT + "soReuseAddress");
+    }
+
+    public static int defaultSoLinger() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + "soLinger");
+    }
+
+    public static int defaultSoSndBuf() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + "soSndBuf");
+    }
+
+    public static int defaultSoRcvBuf() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + "soRcvBuf");
+    }
+
     public static int defaultHttpClientCodecMaxInitialLineLength() {
         return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getInt(ASYNC_CLIENT_CONFIG_ROOT + "httpClientCodecMaxInitialLineLength");
     }

client/src/main/java/org/asynchttpclient/netty/channel/ChannelManager.java

@@ -197,13 +197,26 @@ private Bootstrap newBootstrap(Class<? extends Channel> socketChannelClass, Even
         Bootstrap bootstrap = new Bootstrap().channel(socketChannelClass).group(eventLoopGroup)//
                 // default to PooledByteBufAllocator
                 .option(ChannelOption.ALLOCATOR, config.isUsePooledMemory() ? PooledByteBufAllocator.DEFAULT : UnpooledByteBufAllocator.DEFAULT)//
-                .option(ChannelOption.TCP_NODELAY, true)//
+                .option(ChannelOption.TCP_NODELAY, config.isTcpNoDelay())//
+                .option(ChannelOption.SO_REUSEADDR, config.isSoReuseAddress())//
                 .option(ChannelOption.AUTO_CLOSE, false);
 
         if (config.getConnectTimeout() > 0) {
             bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, config.getConnectTimeout());
         }
 
+        if (config.getSoLinger() >= 0) {
+            bootstrap.option(ChannelOption.SO_LINGER, config.getSoLinger());
+        }
+
+        if (config.getSoSndBuf() >= 0) {
+            bootstrap.option(ChannelOption.SO_SNDBUF, config.getSoSndBuf());
+        }
+
+        if (config.getSoRcvBuf() >= 0) {
+            bootstrap.option(ChannelOption.SO_RCVBUF, config.getSoRcvBuf());
+        }
+
         for (Entry<ChannelOption<Object>, Object> entry : config.getChannelOptions().entrySet()) {
             bootstrap.option(entry.getKey(), entry.getValue());
         }

client/src/main/resources/ahc-default.properties

@@ -24,6 +24,11 @@ org.asynchttpclient.useOpenSsl=false
 org.asynchttpclient.acceptAnyCertificate=false
 org.asynchttpclient.sslSessionCacheSize=0
 org.asynchttpclient.sslSessionTimeout=0
+org.asynchttpclient.tcpNoDelay=true
+org.asynchttpclient.soReuseAddress=false
+org.asynchttpclient.soLinger=-1
+org.asynchttpclient.soSndBuf=-1
+org.asynchttpclient.soRcvBuf=-1
 org.asynchttpclient.httpClientCodecMaxInitialLineLength=4096
 org.asynchttpclient.httpClientCodecMaxHeaderSize=8192
 org.asynchttpclient.httpClientCodecMaxChunkSize=8192