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

Fix regression in handling of NotFound err during startup

Signed-off-by: Deep Debroy <ddebroy@docker.com>
(cherry picked from commit 4d5b6260bc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Deep Debroy 2019-08-08 16:50:25 -07:00 committed by Sebastiaan van Stijn
parent 305b2416ea
commit 685565ad18
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C

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
}