beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prevent a goroutine leak when healthcheck gets stopped

Browse source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2017-06-21 17:36:19 -07:00
parent 795a2fdbcb
commit 67297ba005
No known key found for this signature in database
GPG key ID: 40CF16616B361216
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/health.go
View file

@ -186,7 +186,7 @@ func monitor(d *Daemon, c *container.Container, stop chan struct{}, probe probe)
logrus.Debugf("Running health check for container %s ...", c.ID) logrus.Debugf("Running health check for container %s ...", c.ID)
startTime := time.Now() startTime := time.Now()
ctx, cancelProbe := context.WithTimeout(context.Background(), probeTimeout) ctx, cancelProbe := context.WithTimeout(context.Background(), probeTimeout)
results := make(chan *types.HealthcheckResult) results := make(chan *types.HealthcheckResult, 1)
go func() { go func() {
healthChecksCounter.Inc() healthChecksCounter.Inc()
result, err := probe.run(ctx, d, c) result, err := probe.run(ctx, d, c)
@ -209,8 +209,10 @@ func monitor(d *Daemon, c *container.Container, stop chan struct{}, probe probe)
select { select {
case <-stop: case <-stop:
logrus.Debugf("Stop healthcheck monitoring for container %s (received while probing)", c.ID) logrus.Debugf("Stop healthcheck monitoring for container %s (received while probing)", c.ID)
// Stop timeout and kill probe, but don't wait for probe to exit.
cancelProbe() cancelProbe()
// Wait for probe to exit (it might take a while to respond to the TERM
// signal and we don't want dying probes to pile up).
<-results
return return
case result := <-results: case result := <-results:
handleProbeResult(d, c, result, stop) handleProbeResult(d, c, result, stop)