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

Merge pull request #39703 from ddebroy/fix-39623

Browse source 
Fix regression in handling of NotFound err during startup ENGCORE-929
This commit is contained in:
Sebastiaan van Stijn 2019-08-09 14:42:14 +02:00 committed by GitHub
commit 4cc9dc73ba
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

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