Fixed Duplicate Client-token issue

kubernetes-sigs · Aug 5, 2024 · 2ed7ce9 · 2ed7ce9
1 parent 2c80cae
commit 2ed7ce9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
@@ -95,7 +95,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
@@ -810,7 +810,7 @@ func TestCreateVolume(t *testing.T) {
 						Uid: 1000,
 					},
 				}
-				mockCloud.EXPECT().FindAccessPointByClientToken(gomock.Eq(ctx), gomock.Any(), gomock.Eq(fsId)).Return(accessPoint, nil)
+				mockCloud.EXPECT().FindAccessPointByClientToken(gomock.Eq(ctx), gomock.Eq(get64LenHash(pvcNameVal+fsId)), gomock.Eq(fsId)).Return(accessPoint, nil)
 
 				res, err := driver.CreateVolume(ctx, req)