[#1038]Http client manager add idletimeout and timetolive configurati…

…on (#1039)
huaweicloud · May 23, 2023 · afc11b2 · afc11b2
1 parent 11641e6
commit afc11b2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/...ommon/src/main/java/com/huaweicloud/common/configration/dynamic/HttpClientProperties.java b/...ommon/src/main/java/com/huaweicloud/common/configration/dynamic/HttpClientProperties.java
@@ -22,6 +22,10 @@ public class HttpClientProperties {
 
   private int readTimeoutInMilliSeconds = 30000;
 
+  private int connectionIdleTimeoutInMilliSeconds = 30000;
+
+  private int connectionTimeToLiveInMilliSeconds = -1;
+
   private int poolSizePerRoute = 50;
 
   private int poolSizeMax = 5000;
@@ -65,4 +69,20 @@ public int getPoolSizeMax() {
   public void setPoolSizeMax(int poolSizeMax) {
     this.poolSizeMax = poolSizeMax;
   }
+
+  public int getConnectionIdleTimeoutInMilliSeconds() {
+    return connectionIdleTimeoutInMilliSeconds;
+  }
+
+  public void setConnectionIdleTimeoutInMilliSeconds(int connectionIdleTimeoutInMilliSeconds) {
+    this.connectionIdleTimeoutInMilliSeconds = connectionIdleTimeoutInMilliSeconds;
+  }
+
+  public int getConnectionTimeToLiveInMilliSeconds() {
+    return connectionTimeToLiveInMilliSeconds;
+  }
+
+  public void setConnectionTimeToLiveInMilliSeconds(int connectionTimeToLiveInMilliSeconds) {
+    this.connectionTimeToLiveInMilliSeconds = connectionTimeToLiveInMilliSeconds;
+  }
 }
diff --git a/...i-common/src/main/java/com/huaweicloud/common/transport/ClientTransportConfiguration.java b/...i-common/src/main/java/com/huaweicloud/common/transport/ClientTransportConfiguration.java
@@ -17,6 +17,8 @@
 
 package com.huaweicloud.common.transport;
 
+import java.util.concurrent.TimeUnit;
+
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.impl.client.HttpClientBuilder;
@@ -32,7 +34,8 @@ public class ClientTransportConfiguration {
   @Bean
   @ConditionalOnMissingBean
   public HttpClient transportHttpClient(HttpClientProperties httpClientProperties) {
-    PoolingHttpClientConnectionManager pool = new PoolingHttpClientConnectionManager();
+    PoolingHttpClientConnectionManager pool = new PoolingHttpClientConnectionManager(
+        httpClientProperties.getConnectionTimeToLiveInMilliSeconds(), TimeUnit.MILLISECONDS);
     pool.setDefaultMaxPerRoute(httpClientProperties.getPoolSizePerRoute());
     pool.setMaxTotal(httpClientProperties.getPoolSizeMax());
     return HttpClientBuilder.create()
@@ -42,6 +45,8 @@ public HttpClient transportHttpClient(HttpClientProperties httpClientProperties)
             .setConnectionRequestTimeout(httpClientProperties.getConnectionRequestTimeoutInMilliSeconds())
             .setSocketTimeout(httpClientProperties.getReadTimeoutInMilliSeconds())
             .build())
+        .evictExpiredConnections().evictIdleConnections(
+            httpClientProperties.getConnectionIdleTimeoutInMilliSeconds(), TimeUnit.MILLISECONDS)
         .build();
   }
 }