Allowing provisioning to proceed to prevent leaking resources

Author: xing-yang

pkg/controller/controller.go

@@ -1160,8 +1160,10 @@ func (p *csiProvisioner) getSnapshotSource(ctx context.Context, claim *v1.Persis
 		return nil, fmt.Errorf("error getting snapshot %s from api server: %v", dataSource.Name, err)
 	}
 
+	// Allow the create volume request to proceed even if the snapshot is being deleted.
+	// This ensures proper cleanup of orphaned volumes and allows snapshot deletion to proceed.
 	if snapshotObj.ObjectMeta.DeletionTimestamp != nil {
-		return nil, fmt.Errorf("snapshot %s is currently being deleted", dataSource.Name)
+		klog.V(3).Infof("Snapshot %s/%s is being deleted, but allowing provisioning to proceed for potential cleanup", dataSource.Namespace, dataSource.Name)
 	}
 	klog.V(5).Infof("VolumeSnapshot %+v", snapshotObj)
 

pkg/controller/controller_test.go

@@ -2963,6 +2963,7 @@ func TestProvisionFromSnapshot(t *testing.T) {
 		nilContentStatus                  bool
 		nilSnapshotHandle                 bool
 		allowVolumeModeChange             bool
+		snapshotBeingDeleted              bool // set DeletionTimestamp on snapshot
 		xnsEnabled                        bool // set to use CrossNamespaceVolumeDataSource feature, default false
 		snapNamespace                     string
 		withreferenceGrants               bool // set to use ReferenceGrant, default false
@@ -4486,6 +4487,55 @@ func TestProvisionFromSnapshot(t *testing.T) {
 			referenceGrantFrom:   []gatewayv1beta1.ReferenceGrantFrom{},
 			referenceGrantTo:     []gatewayv1beta1.ReferenceGrantTo{},
 		},
+		"provision with snapshot being deleted should proceed for cleanup": {
+			volOpts: controller.ProvisionOptions{
+				StorageClass: &storagev1.StorageClass{
+					ReclaimPolicy: &deletePolicy,
+					Parameters:    map[string]string{},
+					Provisioner:   "test-driver",
+				},
+				PVName: "test-name",
+				PVC: &v1.PersistentVolumeClaim{
+					ObjectMeta: metav1.ObjectMeta{
+						UID:         "testid",
+						Annotations: driverNameAnnotation,
+					},
+					Spec: v1.PersistentVolumeClaimSpec{
+						StorageClassName: &snapClassName,
+						Resources: v1.VolumeResourceRequirements{
+							Requests: v1.ResourceList{
+								v1.ResourceName(v1.ResourceStorage): resource.MustParse(strconv.FormatInt(requestedBytes, 10)),
+							},
+						},
+						AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
+						DataSource: &v1.TypedLocalObjectReference{
+							Name:     snapName,
+							Kind:     "VolumeSnapshot",
+							APIGroup: &apiGrp,
+						},
+					},
+				},
+			},
+			snapshotStatusReady:  true,
+			snapshotBeingDeleted: true,
+			expectedPVSpec: &pvSpec{
+				Name:          "test-testi",
+				ReclaimPolicy: v1.PersistentVolumeReclaimDelete,
+				AccessModes:   []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
+				Capacity: v1.ResourceList{
+					v1.ResourceName(v1.ResourceStorage): bytesToQuantity(requestedBytes),
+				},
+				CSIPVS: &v1.CSIPersistentVolumeSource{
+					Driver:       "test-driver",
+					VolumeHandle: "test-volume-id",
+					FSType:       "ext4",
+					VolumeAttributes: map[string]string{
+						"storage.kubernetes.io/csiProvisionerIdentity": "test-provisioner",
+					},
+				},
+			},
+			expectCSICall: true,
+		},
 	}
 
 	tmpdir := tempDir(t)
@@ -4516,6 +4566,10 @@ func TestProvisionFromSnapshot(t *testing.T) {
 			if tc.nilReadyToUse {
 				snap.Status.ReadyToUse = nil
 			}
+			if tc.snapshotBeingDeleted {
+				deletionTime := metav1.Now()
+				snap.ObjectMeta.DeletionTimestamp = &deletionTime
+			}
 			return true, snap, nil
 		})