Merge branch 'volume-cloning-feature' of https://github.com/amacaskill/gcp-compute-persistent-disk-csi-driver into volume-cloning-feature

Author: amacaskill

pkg/gce-pd-csi-driver/controller.go

@@ -208,29 +208,24 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 		if content.GetVolume() != nil {
 			volumeContentSourceVolumeID = content.GetVolume().GetVolumeId()
 			// Verify that the source VolumeID is in the correct format.
-			_, _, err := common.VolumeIDToKey(volumeContentSourceVolumeID)
+			project, volKey, err := common.VolumeIDToKey(volumeContentSourceVolumeID)
 			if err != nil {
 				return nil, status.Error(codes.InvalidArgument, fmt.Sprintf("CreateVolume source volume ID is invalid: %v", err))
 			}
-			// Verify the volume in VolumeContentSource exists.
-			if acquired := gceCS.volumeLocks.TryAcquire(volumeContentSourceVolumeID); acquired {
-				return nil, status.Errorf(codes.NotFound, "CreateVolume source volume %s does not exist", volumeContentSourceVolumeID)
+
+			// Verify that the volume in VolumeContentSource exists.
+			diskFromSourceVolume, err := gceCS.CloudProvider.GetDisk(ctx, project, volKey, gceAPIVersion)
+			if err != nil {
+				if gce.IsGCEError(err, "notFound") {
+					return nil, status.Errorf(codes.NotFound, "CreateVolume source volume %s does not exist", volumeContentSourceVolumeID)
+				} else {
+					return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume unknown get disk error when validating: %v", err))
+				}
+			}
+			// Verify the zone, region, and disk type of the clone must be the same as that of the source disk.
+			if err := gce.ValidateDiskParameters(diskFromSourceVolume, params); err != nil {
+				return nil, status.Errorf(codes.InvalidArgument, `CreateVolume source volume parameters do not match CreateVolumeRequest Parameters: %v`, err)
 			}
-			defer gceCS.volumeLocks.Release(volumeContentSourceVolumeID)
-
-			// // Verify that the volume in VolumeContentSource exists.
-			// diskFromSourceVolume, err := gceCS.CloudProvider.GetDisk(ctx, project, volKey, gceAPIVersion)
-			// if err != nil {
-			// 	if gce.IsGCEError(err, "notFound") {
-			// 		return nil, status.Errorf(codes.NotFound, "CreateVolume source volume %s does not exist", volumeContentSourceVolumeID)
-			// 	} else {
-			// 		return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume unknown get disk error when validating: %v", err))
-			// 	}
-			// }
-			//	Verify the zone, region, and disk type of the clone must be the same as that of the source disk.
-			// if err := gce.ValidateDiskParameters(diskFromSourceVolume, params); err != nil {
-			// 	return nil, status.Errorf(codes.InvalidArgument, `CreateVolume source volume parameters do not match CreateVolumeRequest Parameters: %v`, err)
-			// }
 			// // Verify the source disk is ready.
 			// if err == nil {
 			// 	ready, err := isDiskReady(diskFromSourceVolume)
@@ -276,7 +271,6 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 
 	klog.V(4).Infof("CreateVolume succeeded for disk %v", volKey)
 	return generateCreateVolumeResponse(disk, zones), nil
-
 }
 
 func (gceCS *GCEControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest) (*csi.DeleteVolumeResponse, error) {