kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix deadlock on cancelling healthcheck

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2016-11-15 18:02:26 -08:00
parent 27c20a7ea0
commit 89b1234737
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
container/health.go
View file

@ -42,10 +42,7 @@ func (s *Health) OpenMonitorChannel() chan struct{} {
func (s *Health) CloseMonitorChannel() {
if s.stop != nil {
logrus.Debug("CloseMonitorChannel: waiting for probe to stop")
// This channel does not buffer. Once the write succeeds, the monitor
// has read the stop request and will not make any further updates
// to c.State.Health.
s.stop <- struct{}{}
close(s.stop)
s.stop = nil
logrus.Debug("CloseMonitorChannel done")
}