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

Merge pull request #317 from thaJeztah/19.03_backport_fix_39623

Browse source 
[19.03 backport] Fix regression in handling of NotFound err during startup ENGCORE-929
This commit is contained in:
Andrew Hsu 2019-08-08 20:39:02 -07:00 • committed by GitHub
commit 29fe4e58c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/daemon.go
View file

@ -335,7 +335,7 @@ func (daemon *Daemon) restore() error {
}
if !alive && process != nil {
ec, exitedAt, err = process.Delete(context.Background())
if err != nil {
if err != nil && !errdefs.IsNotFound(err) {
logrus.WithError(err).Errorf("Failed to delete container %s from containerd", c.ID)
return
}