Merge pull request #5206 from Iceber/fix-new-container

fuweid · web-flow · commit 1a0973dde31d · 2021-03-17T12:11:45.000+08:00
runtime/v2/runc: fix the defer cleanup of the NewContainer
diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go
@@ -42,7 +42,7 @@ import (
 )
 
 // NewContainer returns a new runc container
-func NewContainer(ctx context.Context, platform stdio.Platform, r *task.CreateTaskRequest) (*Container, error) {
+func NewContainer(ctx context.Context, platform stdio.Platform, r *task.CreateTaskRequest) (_ *Container, retErr error) {
 	ns, err := namespaces.NamespaceRequired(ctx)
 	if err != nil {
 		return nil, errors.Wrap(err, "create namespace")
@@ -97,9 +97,9 @@ func NewContainer(ctx context.Context, platform stdio.Platform, r *task.CreateTa
 		return nil, err
 	}
 	defer func() {
-		if err != nil {
-			if err2 := mount.UnmountAll(rootfs, 0); err2 != nil {
-				logrus.WithError(err2).Warn("failed to cleanup rootfs mount")
+		if retErr != nil {
+			if err := mount.UnmountAll(rootfs, 0); err != nil {
+				logrus.WithError(err).Warn("failed to cleanup rootfs mount")
 			}
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ import (`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`// NewContainer returns a new runc container`
`45`		`-func NewContainer(ctx context.Context, platform stdio.Platform, r task.CreateTaskRequest) (Container, error) {`
	`45`	`+func NewContainer(ctx context.Context, platform stdio.Platform, r task.CreateTaskRequest) (_ Container, retErr error) {`
`46`	`46`	`ns, err := namespaces.NamespaceRequired(ctx)`
`47`	`47`	`if err != nil {`
`48`	`48`	`return nil, errors.Wrap(err, "create namespace")`
`@@ -97,9 +97,9 @@ func NewContainer(ctx context.Context, platform stdio.Platform, r *task.CreateTa`
`97`	`97`	`return nil, err`
`98`	`98`	`}`
`99`	`99`	`defer func() {`
`100`		`- if err != nil {`
`101`		`- if err2 := mount.UnmountAll(rootfs, 0); err2 != nil {`
`102`		`- logrus.WithError(err2).Warn("failed to cleanup rootfs mount")`
	`100`	`+ if retErr != nil {`
	`101`	`+ if err := mount.UnmountAll(rootfs, 0); err != nil {`
	`102`	`+ logrus.WithError(err).Warn("failed to cleanup rootfs mount")`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}()`