Skip to content

[release-1.29] fix: reduce mount lock to avoid volumeID collision issue #1643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 27, 2023
Merged

[release-1.29] fix: reduce mount lock to avoid volumeID collision issue #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pkg/azurefile/nodeserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,11 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
return nil, status.Errorf(codes.InvalidArgument, "fsGroupChangePolicy(%s) is not supported, supported fsGroupChangePolicy list: %v", fsGroupChangePolicy, supportedFSGroupChangePolicyList)
}

if acquired := d.volumeLocks.TryAcquire(volumeID); !acquired {
lockKey := fmt.Sprintf("%s-%s", volumeID, targetPath)
if acquired := d.volumeLocks.TryAcquire(lockKey); !acquired {
return nil, status.Errorf(codes.Aborted, volumeOperationAlreadyExistsFmt, volumeID)
}
defer d.volumeLocks.Release(volumeID)
defer d.volumeLocks.Release(lockKey)

if strings.TrimSpace(storageEndpointSuffix) == "" {
if d.cloud.Environment.StorageEndpointSuffix != "" {
Expand Down Expand Up @@ -393,10 +394,11 @@ func (d *Driver) NodeUnstageVolume(_ context.Context, req *csi.NodeUnstageVolume
return nil, status.Error(codes.InvalidArgument, "Staging target not provided")
}

if acquired := d.volumeLocks.TryAcquire(volumeID); !acquired {
lockKey := fmt.Sprintf("%s-%s", volumeID, stagingTargetPath)
if acquired := d.volumeLocks.TryAcquire(lockKey); !acquired {
return nil, status.Errorf(codes.Aborted, volumeOperationAlreadyExistsFmt, volumeID)
}
defer d.volumeLocks.Release(volumeID)
defer d.volumeLocks.Release(lockKey)

mc := metrics.NewMetricContext(azureFileCSIDriverName, "node_unstage_volume", d.cloud.ResourceGroup, "", d.Name)
isOperationSucceeded := false
Expand Down
8 changes: 4 additions & 4 deletions pkg/azurefile/nodeserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ func TestNodeStageVolume(t *testing.T) {
{
desc: "[Error] Volume operation in progress",
setup: func() {
d.volumeLocks.TryAcquire("vol_1##")
d.volumeLocks.TryAcquire(fmt.Sprintf("%s-%s", "vol_1##", sourceTest))
},
req: csi.NodeStageVolumeRequest{VolumeId: "vol_1##", StagingTargetPath: sourceTest,
VolumeCapability: &stdVolCap,
Expand All @@ -535,7 +535,7 @@ func TestNodeStageVolume(t *testing.T) {
DefaultError: status.Error(codes.Aborted, fmt.Sprintf(volumeOperationAlreadyExistsFmt, "vol_1##")),
},
cleanup: func() {
d.volumeLocks.Release("vol_1##")
d.volumeLocks.Release(fmt.Sprintf("%s-%s", "vol_1##", sourceTest))
},
},
{
Expand Down Expand Up @@ -784,14 +784,14 @@ func TestNodeUnstageVolume(t *testing.T) {
{
desc: "[Error] Volume operation in progress",
setup: func() {
d.volumeLocks.TryAcquire("vol_1")
d.volumeLocks.TryAcquire(fmt.Sprintf("%s-%s", "vol_1", targetFile))
},
req: csi.NodeUnstageVolumeRequest{StagingTargetPath: targetFile, VolumeId: "vol_1"},
expectedErr: testutil.TestError{
DefaultError: status.Error(codes.Aborted, fmt.Sprintf(volumeOperationAlreadyExistsFmt, "vol_1")),
},
cleanup: func() {
d.volumeLocks.Release("vol_1")
d.volumeLocks.Release(fmt.Sprintf("%s-%s", "vol_1", targetFile))
},
},
{
Expand Down