Do not return error when rootfs already exists.

Random-Liu · Random-Liu · commit 48b81e872c93 · 2019-05-22T15:57:19.000-07:00
Signed-off-by: Lantao Liu &lt;lantaol@google.com&gt;
diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go
@@ -127,7 +127,7 @@ func (s *Service) Create(ctx context.Context, r *shimapi.CreateTaskRequest) (_ *
 	rootfs := ""
 	if len(mounts) > 0 {
 		rootfs = filepath.Join(r.Bundle, "rootfs")
-		if err := os.Mkdir(rootfs, 0711); err != nil {
+		if err := os.Mkdir(rootfs, 0711); err != nil && !os.IsExist(err) {
 			return nil, err
 		}
 	}
diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go
@@ -68,7 +68,7 @@ func NewContainer(ctx context.Context, platform rproc.Platform, r *task.CreateTa
 	rootfs := ""
 	if len(mounts) > 0 {
 		rootfs = filepath.Join(r.Bundle, "rootfs")
-		if err := os.Mkdir(rootfs, 0711); err != nil {
+		if err := os.Mkdir(rootfs, 0711); err != nil && !os.IsExist(err) {
 			return nil, err
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func (s Service) Create(ctx context.Context, r shimapi.CreateTaskRequest) (_ *`
`127`	`127`	`rootfs := ""`
`128`	`128`	`if len(mounts) > 0 {`
`129`	`129`	`rootfs = filepath.Join(r.Bundle, "rootfs")`
`130`		`- if err := os.Mkdir(rootfs, 0711); err != nil {`
	`130`	`+ if err := os.Mkdir(rootfs, 0711); err != nil && !os.IsExist(err) {`
`131`	`131`	`return nil, err`
`132`	`132`	`}`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func NewContainer(ctx context.Context, platform rproc.Platform, r *task.CreateTa`
`68`	`68`	`rootfs := ""`
`69`	`69`	`if len(mounts) > 0 {`
`70`	`70`	`rootfs = filepath.Join(r.Bundle, "rootfs")`
`71`		`- if err := os.Mkdir(rootfs, 0711); err != nil {`
	`71`	`+ if err := os.Mkdir(rootfs, 0711); err != nil && !os.IsExist(err) {`
`72`	`72`	`return nil, err`
`73`	`73`	`}`
`74`	`74`	`}`