From 98aa9e63066364b6c4093bd2448618d6959770c7 Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Fri, 22 Apr 2016 11:11:38 -0700 Subject: [PATCH] Timeout docker connections after 1 minute --- client/driver/docker.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client/driver/docker.go b/client/driver/docker.go index dca74a34c953..53a0e4f928c9 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -42,6 +42,10 @@ const ( // The key populated in Node Attributes to indicate presence of the Docker // driver dockerDriverAttr = "driver.docker" + + // dockerTimeout is the length of time a request can be outstanding before + // it is timed out. + dockerTimeout = 1 * time.Minute ) type DockerDriver struct { @@ -224,11 +228,13 @@ func (d *DockerDriver) dockerClient() (*docker.Client, error) { d.logger.Printf("[DEBUG] driver.docker: using standard client connection to %s", dockerEndpoint) client, err = docker.NewClient(dockerEndpoint) } + client.HTTPClient.Timeout = dockerTimeout return } d.logger.Println("[DEBUG] driver.docker: using client connection initialized from environment") client, err = docker.NewClientFromEnv() + client.HTTPClient.Timeout = dockerTimeout }) return client, err }