1. docker
  2. Commit 685565ad18b8c5d5b80a4e840967078e847a2555
Browse code

Fix regression in handling of NotFound err during startup

Signed-off-by: Deep Debroy <ddebroy@docker.com>
(cherry picked from commit 4d5b6260bc595d5d9787c67ae887e83432911380)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Deep Debroy authored on 2019/08/09 08:50:25
Showing 1 changed files
daemon/daemon.go
History View file @ 685565a
... ... 
@@ -335,7 +335,7 @@ func (daemon *Daemon) restore() error {
335 335 
 			}
336 336 
 			if !alive && process != nil {
337 337 
 				ec, exitedAt, err = process.Delete(context.Background())
338 
-				if err != nil {
338 
+				if err != nil && !errdefs.IsNotFound(err) {
339 339 
 					logrus.WithError(err).Errorf("Failed to delete container %s from containerd", c.ID)
340 340 
 					return
341 341 
 				}