Merge pull request #32986 from moypray/containerd_close

fix when rpc reports "transport is closing" error, health check go routine will exit
This commit is contained in:
Tõnis Tiigi 2017-05-17 17:04:05 -07:00 committed by GitHub
commit e103125883

View file

@ -154,7 +154,7 @@ func (r *remote) handleConnectionChange() {
logrus.Debugf("libcontainerd: containerd health check returned error: %v", err)
if r.daemonPid != -1 {
if strings.Contains(err.Error(), "is closing") {
if r.closeManually {
// Well, we asked for it to stop, just return
return
}