squash commits

Author: amacaskill

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

@@ -180,7 +180,7 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 			return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume disk %v had error checking ready status: %v", volKey, err))
 		}
 		if !ready {
-			return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume existing disk %v is not ready. Existing disk state= name: %v, ID: %v, status: %v, zone: %v, location-type: %v", volKey, existingDisk.GetName(), existingDisk.GetSourceDiskId(), existingDisk.GetStatus(), existingDisk.GetZone(), existingDisk.LocationType()))
+			return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume existing disk %v is not ready.", volKey))
 		}
 
 		// If there is no validation error, immediately return success
@@ -207,15 +207,10 @@ 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)
-			}
-			defer gceCS.volumeLocks.Release(volumeContentSourceVolumeID)
 
 			// Verify that the volume in VolumeContentSource exists.
 			diskFromSourceVolume, err := gceCS.CloudProvider.GetDisk(ctx, project, volKey, gceAPIVersion)