summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2019-02-15 23:28:16 +0100
committerHåkon Hallingstad <hakon@verizonmedia.com>2019-02-15 23:28:16 +0100
commit95f9b0d2a85dbbeb6a87948dfc45f6fd54e2ad03 (patch)
tree0c7a923210af443b42bd6da1ec0b1a8072c93813
parent6d2e82283f66d45877ca015d9f099f38a4f040b5 (diff)
Reintroduce 30m read timeout
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
index 53c5cef668a..73bf1a9edc8 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
@@ -394,7 +394,8 @@ public class DockerImpl implements Docker {
JerseyDockerCmdExecFactory dockerFactory = new JerseyDockerCmdExecFactory()
.withMaxPerRouteConnections(10)
.withMaxTotalConnections(100)
- .withConnectTimeout((int) Duration.ofSeconds(100).toMillis());
+ .withConnectTimeout((int) Duration.ofSeconds(100).toMillis())
+ .withReadTimeout((int) Duration.ofMinutes(30).toMillis());
DockerClientConfig dockerClientConfig = new DefaultDockerClientConfig.Builder()
.withDockerHost("unix:///var/run/docker.sock")