GitList

Browse code

Merge pull request #317 from thaJeztah/19.03_backport_fix_39623

[19.03 backport] Fix regression in handling of NotFound err during startup ENGCORE-929

Andrew Hsu authored on 2019/08/09 12:39:02
Showing 1 changed files

daemon/daemon.go index f049b0d..e14aa0a 100644

@@ -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
 				}

...	...	@@ -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	}