summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-10-09 16:43:54 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-10-09 16:43:54 +0200
commite84e571a4f0cc72864805c125a81365d01a74e78 (patch)
treead5d8db76f724b689f452f3734c6e09b6efc9351 /configserver
parent710667b8302d68607549cf67c44a055a16029e28 (diff)
Add timeout for requesting a connection from connection pool
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java6
1 files changed, 4 insertions, 2 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 020dfc69764..a185bcaab8a 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
@@ -13,6 +13,7 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import java.io.IOException;
import java.net.URI;
+import java.time.Duration;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -49,8 +50,9 @@ public class ClusterDeploymentMetricsRetriever {
.create(PoolingHttpClientConnectionManager::new)
.setDefaultRequestConfig(
RequestConfig.custom()
- .setConnectTimeout(10 * 1000)
- .setSocketTimeout(10 * 1000)
+ .setConnectionRequestTimeout((int)Duration.ofSeconds(60).toMillis())
+ .setConnectTimeout((int)Duration.ofSeconds(10).toMillis())
+ .setSocketTimeout((int)Duration.ofSeconds(10).toMillis())
.build())
.build();