fix: add lock in CreateVolume to avoid race condition

andyzhangx · andyzhangx · commit 0cd70c4b0c55 · 2024-08-30T14:38:28.000Z
diff --git a/pkg/smb/controllerserver.go b/pkg/smb/controllerserver.go
@@ -99,6 +99,11 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		}
 	}
 
+	if acquired := d.volumeLocks.TryAcquire(name); !acquired {
+		return nil, status.Errorf(codes.Aborted, volumeOperationAlreadyExistsFmt, name)
+	}
+	defer d.volumeLocks.Release(name)
+
 	if createSubDir {
 		// Mount smb base share so we can create a subdirectory
 		if err := d.internalMount(ctx, smbVol, volCap, secrets); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,11 @@ func (d Driver) CreateVolume(ctx context.Context, req csi.CreateVolumeRequest)`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
	`102`	`+ if acquired := d.volumeLocks.TryAcquire(name); !acquired {`
	`103`	`+ return nil, status.Errorf(codes.Aborted, volumeOperationAlreadyExistsFmt, name)`
	`104`	`+ }`
	`105`	`+ defer d.volumeLocks.Release(name)`
	`106`	`+`
`102`	`107`	`if createSubDir {`
`103`	`108`	`// Mount smb base share so we can create a subdirectory`
`104`	`109`	`if err := d.internalMount(ctx, smbVol, volCap, secrets); err != nil {`