From 685565ad18b8c5d5b80a4e840967078e847a2555 Mon Sep 17 00:00:00 2001 From: Deep Debroy Date: Thu, 8 Aug 2019 16:50:25 -0700 Subject: [PATCH] Fix regression in handling of NotFound err during startup Signed-off-by: Deep Debroy (cherry picked from commit 4d5b6260bc595d5d9787c67ae887e83432911380) Signed-off-by: Sebastiaan van Stijn --- daemon/daemon.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index f049b0d2a4..e14aa0aeff 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -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 }