Merge pull request #11553 from vespa-engine/olaa/use-pooling-connection-manager

Use PoolingHttpClientConnectionManager

1 files changed, 11 insertions, 7 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterMetricsRetriever.java
index c971fdd7b13..4f64b73b403 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterMetricsRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterMetricsRetriever.java
@@ -12,6 +12,7 @@ import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -42,12 +43,15 @@ public class ClusterMetricsRetriever {
     private static final List<String> WANTED_METRIC_SERVICES = List.of(VESPA_CONTAINER, VESPA_QRSERVER, VESPA_DISTRIBUTOR);
 
 
-    private static final CloseableHttpClient httpClient = VespaHttpClientBuilder.create()
-            .setDefaultRequestConfig(RequestConfig.custom()
-                    .setConnectTimeout(10 * 1000)
-                    .setSocketTimeout(10 * 1000)
-                    .build())
-            .build();
+
+    private static final CloseableHttpClient httpClient = VespaHttpClientBuilder
+                                                            .create(PoolingHttpClientConnectionManager::new)
+                                                            .setDefaultRequestConfig(
+                                                                    RequestConfig.custom()
+                                                                            .setConnectTimeout(10 * 1000)
+                                                                            .setSocketTimeout(10 * 1000)
+                                                                            .build())
+                                                            .build();
 
     /**
      * Call the metrics API on each host and aggregate the metrics
@@ -62,7 +66,7 @@ public class ClusterMetricsRetriever {
                     getHostMetrics(host, clusterMetricsMap)
                 );
 
-        ForkJoinPool threadPool = new ForkJoinPool(5);
+        ForkJoinPool threadPool = new ForkJoinPool(10);
         threadPool.submit(retrieveMetricsJob);
         threadPool.shutdown();