Merge pull request #39703 from ddebroy/fix-39623

Fix regression in handling of NotFound err during startup ENGCORE-929

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
 				}