From 2f1d1cb59bb06f9e5edf75f903c720d70e958c06 Mon Sep 17 00:00:00 2001 From: SHASHIKANTH MADDINENI Date: Tue, 24 Oct 2023 23:43:37 -0400 Subject: [PATCH] Fixed Duplicate Client-token issue --- pkg/driver/controller.go | 2 +- pkg/driver/controller_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go index 695c4e2fa..aa733a95c 100644 --- a/pkg/driver/controller.go +++ b/pkg/driver/controller.go @@ -92,7 +92,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest) return nil, status.Error(codes.InvalidArgument, "Invalid value for reuseAccessPoint parameter") } if reuseAccessPoint { - clientToken = get64LenHash(volumeParams[PvcNameKey]) + clientToken = get64LenHash(volumeParams[PvcNameKey] + volumeParams[FsId]) klog.V(5).Infof("Client token : %s", clientToken) } } diff --git a/pkg/driver/controller_test.go b/pkg/driver/controller_test.go index 3d702f522..8b27f2bd8 100644 --- a/pkg/driver/controller_test.go +++ b/pkg/driver/controller_test.go @@ -787,7 +787,7 @@ func TestCreateVolume(t *testing.T) { accessPoints := []*cloud.AccessPoint{accessPoint} mockCloud.EXPECT().DescribeFileSystem(gomock.Eq(ctx), gomock.Any()).Return(fileSystem, nil) mockCloud.EXPECT().ListAccessPoints(gomock.Eq(ctx), gomock.Any()).Return(accessPoints, nil) - mockCloud.EXPECT().CreateAccessPoint(gomock.Eq(ctx), gomock.Eq(get64LenHash(pvcNameVal)), gomock.Any(), gomock.Any()).Return(accessPoint, nil) + mockCloud.EXPECT().CreateAccessPoint(gomock.Eq(ctx), gomock.Eq(get64LenHash(pvcNameVal+fsId)), gomock.Any(), gomock.Any()).Return(accessPoint, nil) res, err := driver.CreateVolume(ctx, req)