Set connection timeouts

1 files changed, 13 insertions, 1 deletions

diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java
index 932681c4c26..dac6b293942 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java
@@ -8,6 +8,7 @@ import com.yahoo.slime.Type;
 import com.yahoo.system.ProcessExecuter;
 import com.yahoo.vespa.config.SlimeUtils;
 import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.impl.client.HttpClientBuilder;
 
 import java.io.IOException;
@@ -24,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 public class Maintainer {
     private static final CoreCollector coreCollector = new CoreCollector(new ProcessExecuter());
-    private static final HttpClient httpClient = HttpClientBuilder.create().build();
+    private static final HttpClient httpClient = createHttpClient(Duration.ofSeconds(5));
 
     public static void main(String[] args) {
         LogSetup.initVespaLogging("node-maintainer");
@@ -182,4 +183,15 @@ public class Maintainer {
         }
         return out;
     }
+
+    private static HttpClient createHttpClient(Duration timeout) {
+        int timeoutInMillis = (int) timeout.toMillis();
+        return HttpClientBuilder.create()
+                                .setDefaultRequestConfig(RequestConfig.custom()
+                                                                      .setConnectTimeout(timeoutInMillis)
+                                                                      .setConnectionRequestTimeout(timeoutInMillis)
+                                                                      .setSocketTimeout(timeoutInMillis)
+                                                                      .build())
+                                .build();
+    }
 }