Merge pull request #4499 from fuweid/cherry-pick-4472

estesp · web-flow · commit 881db9b52d6e · 2020-08-25T10:14:01.000-04:00
[release/1.4] runtime: ignore ErrNotExist when remove rootfs
diff --git a/runtime/v2/bundle.go b/runtime/v2/bundle.go
@@ -121,7 +121,7 @@ func (b *Bundle) Delete() error {
 	if err := mount.UnmountAll(rootfs, 0); err != nil {
 		return errors.Wrapf(err, "unmount rootfs %s", rootfs)
 	}
-	if err := os.Remove(rootfs); err != nil && os.IsNotExist(err) {
+	if err := os.Remove(rootfs); err != nil && !os.IsNotExist(err) {
 		return errors.Wrap(err, "failed to remove bundle rootfs")
 	}
 	err := atomicDelete(b.Path)

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ func (b *Bundle) Delete() error {`
`121`	`121`	`if err := mount.UnmountAll(rootfs, 0); err != nil {`
`122`	`122`	`return errors.Wrapf(err, "unmount rootfs %s", rootfs)`
`123`	`123`	`}`
`124`		`- if err := os.Remove(rootfs); err != nil && os.IsNotExist(err) {`
	`124`	`+ if err := os.Remove(rootfs); err != nil && !os.IsNotExist(err) {`
`125`	`125`	`return errors.Wrap(err, "failed to remove bundle rootfs")`
`126`	`126`	`}`
`127`	`127`	`err := atomicDelete(b.Path)`