Fix regression in handling of NotFound err during startup

ddebroy · ddebroy · commit 4d5b6260bc59 · 2019-08-08T16:58:52.000-07:00
Signed-off-by: Deep Debroy &lt;ddebroy@docker.com&gt;
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -336,7 +336,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
 				}

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ func (daemon *Daemon) restore() error {`
`336`	`336`	`}`
`337`	`337`	`if !alive && process != nil {`
`338`	`338`	`ec, exitedAt, err = process.Delete(context.Background())`
`339`		`- if err != nil {`
	`339`	`+ if err != nil && !errdefs.IsNotFound(err) {`
`340`	`340`	`logrus.WithError(err).Errorf("Failed to delete container %s from containerd", c.ID)`
`341`	`341`	`return`
`342`	`342`	`}`