Merge pull request #583 from andyzhangx/mkdirall

andyzhangx · web-flow · commit 48be856022fd · 2023-02-19T18:43:57.000+08:00
fix: use mkdir -p for creating subdir in mounted base-dir
diff --git a/pkg/smb/controllerserver.go b/pkg/smb/controllerserver.go
@@ -107,7 +107,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		// Create subdirectory under base-dir
 		// TODO: revisit permissions
 		internalVolumePath := getInternalVolumePath(d.workingMountDir, smbVol)
-		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())
 		}
 		setKeyValueInMap(parameters, subDirField, smbVol.subDir)

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (d Driver) CreateVolume(ctx context.Context, req csi.CreateVolumeRequest)`
`107`	`107`	`// Create subdirectory under base-dir`
`108`	`108`	`// TODO: revisit permissions`
`109`	`109`	`internalVolumePath := getInternalVolumePath(d.workingMountDir, smbVol)`
`110`		`- if err = os.Mkdir(internalVolumePath, 0777); err != nil && !os.IsExist(err) {`
	`110`	`+ if err = os.MkdirAll(internalVolumePath, 0777); err != nil {`
`111`	`111`	`return nil, status.Errorf(codes.Internal, "failed to make subdirectory: %v", err.Error())`
`112`	`112`	`}`
`113`	`113`	`setKeyValueInMap(parameters, subDirField, smbVol.subDir)`