Merge pull request #412 from alankan-finocomp/patch-1

k8s-ci-robot · web-flow · commit b3403671f652 · 2023-02-13T02:49:30.000-08:00
fix: use `mkdir -p` for creating subdir in mounted base-dir
diff --git a/pkg/nfs/controllerserver.go b/pkg/nfs/controllerserver.go
@@ -132,7 +132,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 
 	// Create subdirectory under base-dir
 	internalVolumePath := getInternalVolumePath(cs.Driver.workingMountDir, nfsVol)
-	if err = os.Mkdir(internalVolumePath, 0777); err != nil && !os.IsExist(err) {
+	if err = os.MkdirAll(internalVolumePath, 0777); err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to make subdirectory: %v", err.Error())
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func (cs ControllerServer) CreateVolume(ctx context.Context, req csi.CreateVol`
`132`	`132`
`133`	`133`	`// Create subdirectory under base-dir`
`134`	`134`	`internalVolumePath := getInternalVolumePath(cs.Driver.workingMountDir, nfsVol)`
`135`		`- if err = os.Mkdir(internalVolumePath, 0777); err != nil && !os.IsExist(err) {`
	`135`	`+ if err = os.MkdirAll(internalVolumePath, 0777); err != nil {`
`136`	`136`	`return nil, status.Errorf(codes.Internal, "failed to make subdirectory: %v", err.Error())`
`137`	`137`	`}`
`138`	`138`