luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

use client with shorter timeouts for health checks

Browse source
This commit is contained in:
Chelsea Holland Komlo 2018-04-03 16:55:46 -04:00
parent 5d1b2b77cb
commit d0d793fc23
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
client/driver/docker.go
View file

@ -50,6 +50,10 @@ var (
// running operations such as waiting on containers and collect stats
waitClient *docker.Client
// healthCheckClient is a docker client with a timeout of 1 minute. This is
// necessary to have a shorter timeout than other API or fingerprint calls
healthCheckClient *docker.Client
// The statistics the Docker driver exposes
DockerMeasuredMemStats = []string{"RSS", "Cache", "Swap", "Max Usage"}
DockerMeasuredCpuStats = []string{"Throttled Periods", "Throttled Time", "Percent"}
@ -107,6 +111,10 @@ const (
// it is timed out.
dockerTimeout = 5 * time.Minute
// dockerHealthCheckTimeout is the length of time a request for a health
// check client can be outstanding before it is timed out.
dockerHealthCheckTimeout = 5 * time.Minute
// dockerImageResKey is the CreatedResources key for docker images
dockerImageResKey = "image"
@ -559,7 +567,7 @@ func (d *DockerDriver) HealthCheck(req *cstructs.HealthCheckRequest, resp *cstru
UpdateTime: time.Now(),
}
client, _, err := d.dockerClients()
healthCheckClient, err := d.dockerHealthCheckClient()
if err != nil {
d.logger.Printf("[WARN] driver.docker: failed to retrieve Docker client in the process of a docker health check: %v", err)
dinfo.HealthDescription = fmt.Sprintf("Failed retrieving Docker client: %v", err)
@ -567,7 +575,7 @@ func (d *DockerDriver) HealthCheck(req *cstructs.HealthCheckRequest, resp *cstru
return nil
}
_, err = client.ListContainers(docker.ListContainersOptions{All: false})
_, err = healthCheckClient.ListContainers(docker.ListContainersOptions{All: false})
if err != nil {
d.logger.Printf("[WARN] driver.docker: failed to list Docker containers in the process of a Docker health check: %v", err)
dinfo.HealthDescription = fmt.Sprintf("Failed to list Docker containers: %v", err)
@ -1000,6 +1008,21 @@ func (d *DockerDriver) cleanupImage(imageID string) error {
return nil
}
func (d *DockerDriver) dockerHealthCheckClient() (*docker.Client, error) {
if healthCheckClient != nil {
return healthCheckClient, nil
}
newHealthCheckClient, err := d.newDockerClient(dockerHealthCheckTimeout)
if err != nil {
return nil, err
} else {
healthCheckClient = newHealthCheckClient
}
return healthCheckClient, nil
}
func (d *DockerDriver) newDockerClient(timeout time.Duration) (*docker.Client, error) {
var err error
var merr multierror.Error