summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-10-12 10:20:07 +0200
committerGitHub <noreply@github.com>2020-10-12 10:20:07 +0200
commitdede45f1333204f015e22770fdfb3738936ac2a6 (patch)
treecc5dd63afa2b3169a728fa90dec63e45b412550f
parent87c1ea2848847ef4d10243286b2980b075f45b0a (diff)
parentf7f084541e757ceff72a11983e21c380b472ccbf (diff)
Merge pull request #14810 from vespa-engine/bjorncs/fix-threadpool-leakage
Close connections older than 1 minute
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java
index a185bcaab8a..cdf2db554da 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java
@@ -47,7 +47,8 @@ public class ClusterDeploymentMetricsRetriever {
private static final ExecutorService executor = Executors.newFixedThreadPool(10, new DaemonThreadFactory("cluster-deployment-metrics-retriever-"));
private static final CloseableHttpClient httpClient = VespaHttpClientBuilder
- .create(PoolingHttpClientConnectionManager::new)
+ .create(registry ->
+ new PoolingHttpClientConnectionManager(registry, null, null, null, 1, TimeUnit.MINUTES))
.setDefaultRequestConfig(
RequestConfig.custom()
.setConnectionRequestTimeout((int)Duration.ofSeconds(60).toMillis())