Merge pull request #270 from andyzhangx/remove-lock

fix: remove unnecessary lock in NodePublish

Author: andyzhangx

pkg/smb/nodeserver.go

@@ -65,11 +65,6 @@ func (d *Driver) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolu
 		return nil, status.Error(codes.InvalidArgument, "Staging target not provided")
 	}
 
-	if acquired := d.volumeLocks.TryAcquire(volumeID); !acquired {
-		return nil, status.Errorf(codes.Aborted, volumeOperationAlreadyExistsFmt, volumeID)
-	}
-	defer d.volumeLocks.Release(volumeID)
-
 	mountOptions := []string{"bind"}
 	if req.GetReadonly() {
 		mountOptions = append(mountOptions, "ro")
@@ -130,10 +125,6 @@ func (d *Driver) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublish
 	if len(targetPath) == 0 {
 		return nil, status.Error(codes.InvalidArgument, "Target path missing in request")
 	}
-	if acquired := d.volumeLocks.TryAcquire(volumeID); !acquired {
-		return nil, status.Errorf(codes.Aborted, volumeOperationAlreadyExistsFmt, volumeID)
-	}
-	defer d.volumeLocks.Release(volumeID)
 
 	klog.V(2).Infof("NodeUnpublishVolume: unmounting volume %s on %s", volumeID, targetPath)
 	err := CleanupMountPoint(d.mounter, targetPath, false)

pkg/smb/nodeserver_test.go

@@ -304,23 +304,6 @@ func TestNodePublishVolume(t *testing.T) {
 				WindowsError: status.Errorf(codes.Internal, "Could not mount target %#v: mkdir %s: The system cannot find the path specified.", smbFile, smbFile),
 			},
 		},
-		{
-			desc: "[Error] Volume operation in progress",
-			setup: func(d *Driver) {
-				d.volumeLocks.TryAcquire("vol_1")
-			},
-			req: csi.NodePublishVolumeRequest{VolumeCapability: &csi.VolumeCapability{AccessMode: &volumeCap},
-				VolumeId:          "vol_1",
-				TargetPath:        targetTest,
-				StagingTargetPath: sourceTest,
-				Readonly:          true},
-			expectedErr: testutil.TestError{
-				DefaultError: status.Error(codes.Aborted, fmt.Sprintf(volumeOperationAlreadyExistsFmt, "vol_1")),
-			},
-			cleanup: func(d *Driver) {
-				d.volumeLocks.Release("vol_1")
-			},
-		},
 		{
 			desc: "[Error] Mount error mocked by Mount",
 			req: csi.NodePublishVolumeRequest{VolumeCapability: &csi.VolumeCapability{AccessMode: &volumeCap},
@@ -422,19 +405,6 @@ func TestNodeUnpublishVolume(t *testing.T) {
 				DefaultError: status.Error(codes.InvalidArgument, "Target path missing in request"),
 			},
 		},
-		{
-			desc: "[Error] Volume operation in progress",
-			setup: func(d *Driver) {
-				d.volumeLocks.TryAcquire("vol_1")
-			},
-			req: csi.NodeUnpublishVolumeRequest{TargetPath: targetFile, VolumeId: "vol_1"},
-			expectedErr: testutil.TestError{
-				DefaultError: status.Error(codes.Aborted, fmt.Sprintf(volumeOperationAlreadyExistsFmt, "vol_1")),
-			},
-			cleanup: func(d *Driver) {
-				d.volumeLocks.Release("vol_1")
-			},
-		},
 		{
 			desc: "[Error] Unmount error mocked by IsLikelyNotMountPoint",
 			req:  csi.NodeUnpublishVolumeRequest{TargetPath: errorTarget, VolumeId: "vol_1"},