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

Merge pull request #40096 from cpuguy83/c8d_no_healthcheck_loop

Browse source 
Wait for c8d process exit instead of polling API
This commit is contained in:
Brian Goff 2019-10-17 14:24:28 -07:00 • committed by GitHub
commit 1e000435e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libcontainerd/supervisor/remote_daemon.go
View file

@ -300,6 +300,7 @@ func (r *remote) monitorDaemon(ctx context.Context) {
delay = 100 * time.Millisecond
continue
}
logrus.WithField("address", r.GRPC.Address).Debug("Created containerd monitoring client")
}
if client != nil {
@ -313,6 +314,14 @@ func (r *remote) monitorDaemon(ctx context.Context) {
}
transientFailureCount = 0
select {
case <-r.daemonWaitCh:
case <-ctx.Done():
}
// Set a small delay in case there is a recurring failure (or bug in this code)
// to ensure we don't end up in a super tight loop.
delay = 500 * time.Millisecond
continue
}