parent 19d670f

author Alexis MacAskill <[email protected]> 1634669949 +0000
committer Alexis MacAskill <[email protected]> 1636674064 +0000

added volume cloning

Author: amacaskill

deploy/kubernetes/images/prow-gke-release-staging-rc-master/image.yaml

@@ -53,5 +53,5 @@ metadata:
 imageTag:
   name: k8s.gcr.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/k8s-staging-cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
-  newTag: "v1.3.2-rc1"
+  newTag: "v1.3.4-rc1"
 ---

pkg/gce-cloud-provider/compute/cloud-disk.go

@@ -177,7 +177,7 @@ func (d *CloudDisk) GetSnapshotId() string {
 	}
 }
 
-func (d *CloudDisk) GetDiskId() string {
+func (d *CloudDisk) GetSourceDiskId() string {
 	switch {
 	case d.disk != nil:
 		return d.disk.SourceDiskId

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

@@ -179,9 +179,8 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 		if err != nil {
 			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 disk %v is not ready", volKey))
+			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()))
 		}
 
 		// If there is no validation error, immediately return success
@@ -207,12 +206,17 @@ 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.
-			project, volKey, err := common.VolumeIDToKey(volumeContentSourceVolumeID)
+			_, _, 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)
 			if err != nil {
@@ -222,12 +226,10 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 					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.
+			// 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)
@@ -238,8 +240,6 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 					return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume disk from source volume %v is not ready", volKey))
 				}
 			}
-			//TODO does this go inside of err == nil?
-
 		}
 	}
 	// Create the disk
@@ -1089,7 +1089,7 @@ func generateCreateVolumeResponse(disk *gce.CloudDisk, zones []string) *csi.Crea
 		},
 	}
 	snapshotID := disk.GetSnapshotId()
-	diskID := disk.GetDiskId()
+	diskID := disk.GetSourceDiskId()
 	if diskID != "" || snapshotID != "" {
 		contentSource := &csi.VolumeContentSource{}
 		if snapshotID != "" {
@@ -1101,7 +1101,6 @@ func generateCreateVolumeResponse(disk *gce.CloudDisk, zones []string) *csi.Crea
 				},
 			}
 		}
-		diskID := disk.GetDiskId()
 		if diskID != "" {
 			contentSource = &csi.VolumeContentSource{
 				Type: &csi.VolumeContentSource_Volume{

test/k8s-integration/driver-config.go

@@ -76,7 +76,6 @@ func generateDriverConfigFile(testParams *testParameters, storageClassFile strin
 	}
 
 	/* Unsupported Capabilities:
-	   pvcDataSource
 	   RWX
 	   volumeLimits # PD Supports volume limits but test is very slow
 	   singleNodeVolume
@@ -117,6 +116,7 @@ func generateDriverConfigFile(testParams *testParameters, storageClassFile strin
 		absSnapshotClassFilePath = filepath.Join(testParams.pkgDir, testConfigDir, testParams.snapshotClassFile)
 	}
 
+	caps = append(caps, "pvcDataSource")
 	minimumVolumeSize := "5Gi"
 	numAllowedTopologies := 1
 	if storageClassFile == regionalPDStorageClass {