CR fixes

Signed-off-by: Arnon Gilboa <agilboa@redhat.com>

pkg/controller/datavolume/controller-base.go

@@ -192,6 +192,16 @@ func getIndexArgs() []indexArgs {
 				return nil
 			},
 		},
+		{
+			obj:   &corev1.PersistentVolume{},
+			field: claimStorageClassNameField,
+			extractValue: func(obj client.Object) []string {
+				if pv, ok := obj.(*corev1.PersistentVolume); ok && pv.Status.Phase == corev1.VolumeAvailable {
+					return []string{pv.Spec.StorageClassName}
+				}
+				return nil
+			},
+		},
 	}
 }
 
@@ -206,14 +216,6 @@ func CreateCommonIndexes(mgr manager.Manager) error {
 			return err
 		}
 	}
-	if err := mgr.GetFieldIndexer().IndexField(context.TODO(), &corev1.PersistentVolume{}, claimStorageClassNameField, func(obj client.Object) []string {
-		if pv, ok := obj.(*corev1.PersistentVolume); ok {
-			return []string{pv.Spec.StorageClassName}
-		}
-		return nil
-	}); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -322,6 +324,7 @@ func addDataVolumeControllerCommonWatches(mgr manager.Manager, dataVolumeControl
 				if storage != nil &&
 					storage.StorageClassName != nil &&
 					*storage.StorageClassName == pv.Spec.StorageClassName &&
+					pv.Status.Phase == corev1.VolumeAvailable &&
 					getDataVolumeOp(mgr.GetLogger(), &dv, mgr.GetClient()) == op {
 					reqs = append(reqs, reconcile.Request{NamespacedName: types.NamespacedName{Name: dv.Name, Namespace: dv.Namespace}})
 				}
@@ -446,10 +449,12 @@ func (r *ReconcilerBase) syncDvPvcState(log logr.Logger, req reconcile.Request,
 		}
 	}
 
-	syncState.pvcSpec, err = renderPvcSpec(r.client, r.recorder, log, dv)
+	syncState.pvcSpec, err = renderPvcSpec(r.client, r.recorder, log, dv, syncState.pvc)
 	if err != nil {
-		r.syncDataVolumeStatusPhaseWithEvent(&syncState, cdiv1.PhaseUnset, nil,
-			Event{corev1.EventTypeWarning, cc.ErrClaimNotValid, err.Error()})
+		if syncErr := r.syncDataVolumeStatusPhaseWithEvent(&syncState, cdiv1.PhaseUnset, nil,
+			Event{corev1.EventTypeWarning, cc.ErrClaimNotValid, err.Error()}); syncErr != nil {
+			log.Error(syncErr, "failed to sync DataVolume status with event")
+		}
 		return syncState, err
 	}
 

pkg/controller/datavolume/pvc-clone-controller.go

@@ -694,7 +694,7 @@ func (r *PvcCloneReconciler) isSourcePVCPopulated(dv *cdiv1.DataVolume) (bool, e
 }
 
 func (r *PvcCloneReconciler) sourceInUse(dv *cdiv1.DataVolume, eventReason string) (bool, error) {
-	pods, err := cc.GetPodsUsingPVCs(r.client, dv.Spec.Source.PVC.Namespace, sets.New[string](dv.Spec.Source.PVC.Name), false)
+	pods, err := cc.GetPodsUsingPVCs(r.client, dv.Spec.Source.PVC.Namespace, sets.New(dv.Spec.Source.PVC.Name), false)
 	if err != nil {
 		return false, err
 	}

pkg/controller/datavolume/pvc-clone-controller_test.go

@@ -729,7 +729,7 @@ var _ = Describe("All DataVolume Tests", func() {
 				{AccessModes: accessMode, VolumeMode: &BlockMode}}, &cloneStrategy)
 
 			reconciler := createCloneReconciler(dv, storageProfile, sc)
-			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv)
+			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv, nil)
 			Expect(err).ToNot(HaveOccurred())
 			done, err := reconciler.detectCloneSize(syncState(dv, targetPvc, pvcSpec), HostAssistedClone)
 			Expect(err).To(HaveOccurred())
@@ -746,7 +746,7 @@ var _ = Describe("All DataVolume Tests", func() {
 			pvc := CreatePvcInStorageClass("test", metav1.NamespaceDefault, &scName, nil, nil, corev1.ClaimBound)
 			reconciler := createCloneReconciler(dv, pvc, storageProfile, sc)
 
-			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv)
+			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv, pvc)
 			Expect(err).ToNot(HaveOccurred())
 			done, err := reconciler.detectCloneSize(syncState(dv, pvc, pvcSpec), HostAssistedClone)
 			Expect(err).ToNot(HaveOccurred())
@@ -774,7 +774,7 @@ var _ = Describe("All DataVolume Tests", func() {
 			pvc.GetAnnotations()[AnnPodPhase] = string(corev1.PodSucceeded)
 			reconciler := createCloneReconciler(dv, pvc, storageProfile, sc)
 
-			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv)
+			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv, pvc)
 			Expect(err).ToNot(HaveOccurred())
 			done, err := reconciler.detectCloneSize(syncState(dv, pvc, pvcSpec), HostAssistedClone)
 			Expect(err).ToNot(HaveOccurred())
@@ -810,7 +810,7 @@ var _ = Describe("All DataVolume Tests", func() {
 			Expect(err).ToNot(HaveOccurred())
 
 			// Checks
-			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv)
+			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv, pvc)
 			Expect(err).ToNot(HaveOccurred())
 			done, err := reconciler.detectCloneSize(syncState(dv, pvc, pvcSpec), HostAssistedClone)
 			Expect(err).To(HaveOccurred())
@@ -851,7 +851,7 @@ var _ = Describe("All DataVolume Tests", func() {
 			Expect(err).ToNot(HaveOccurred())
 
 			// Get the expected value
-			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv)
+			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv, pvc)
 			Expect(err).ToNot(HaveOccurred())
 			expectedSize, err := inflateSizeWithOverhead(reconciler.client, int64(100), pvcSpec)
 			Expect(err).ToNot(HaveOccurred())
@@ -882,7 +882,7 @@ var _ = Describe("All DataVolume Tests", func() {
 			reconciler := createCloneReconciler(dv, pvc, storageProfile, sc)
 
 			// Get the expected value
-			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv)
+			pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv, pvc)
 			Expect(err).ToNot(HaveOccurred())
 			expectedSize, err := inflateSizeWithOverhead(reconciler.client, int64(100), pvcSpec)
 			Expect(err).ToNot(HaveOccurred())
@@ -909,7 +909,7 @@ var _ = Describe("All DataVolume Tests", func() {
 				pvc.Spec.VolumeMode = &volumeMode
 				reconciler := createCloneReconciler(dv, pvc, storageProfile, sc)
 
-				pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv)
+				pvcSpec, err := renderPvcSpec(reconciler.client, reconciler.recorder, reconciler.log, dv, pvc)
 				Expect(err).ToNot(HaveOccurred())
 				expectedSize := *pvc.Status.Capacity.Storage()
 				done, err := reconciler.detectCloneSize(syncState(dv, pvc, pvcSpec), selectedCloneStrategy)

pkg/controller/datavolume/smart-clone-controller.go

@@ -234,7 +234,7 @@ func (r *SmartCloneReconciler) reconcileSnapshot(log logr.Logger, snapshot *snap
 		return reconcile.Result{}, nil
 	}
 
-	targetPvcSpec, err := renderPvcSpec(r.client, r.recorder, r.log, dataVolume)
+	targetPvcSpec, err := renderPvcSpec(r.client, r.recorder, r.log, dataVolume, nil)
 	if err != nil {
 		return reconcile.Result{}, err
 	}

pkg/controller/datavolume/util.go

@@ -48,17 +48,17 @@ const (
 )
 
 // renderPvcSpec creates a new PVC Spec based on either the dv.spec.pvc or dv.spec.storage section
-func renderPvcSpec(client client.Client, recorder record.EventRecorder, log logr.Logger, dv *cdiv1.DataVolume) (*v1.PersistentVolumeClaimSpec, error) {
+func renderPvcSpec(client client.Client, recorder record.EventRecorder, log logr.Logger, dv *cdiv1.DataVolume, pvc *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaimSpec, error) {
 	if dv.Spec.PVC != nil {
 		return dv.Spec.PVC.DeepCopy(), nil
 	} else if dv.Spec.Storage != nil {
-		return pvcFromStorage(client, recorder, log, dv)
+		return pvcFromStorage(client, recorder, log, dv, pvc)
 	}
 
 	return nil, errors.Errorf("datavolume one of {pvc, storage} field is required")
 }
 
-func pvcFromStorage(client client.Client, recorder record.EventRecorder, log logr.Logger, dv *cdiv1.DataVolume) (*v1.PersistentVolumeClaimSpec, error) {
+func pvcFromStorage(client client.Client, recorder record.EventRecorder, log logr.Logger, dv *cdiv1.DataVolume, pvc *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaimSpec, error) {
 	storage := dv.Spec.Storage
 	pvcSpec := copyStorageAsPvc(log, storage)
 
@@ -77,17 +77,9 @@ func pvcFromStorage(client client.Client, recorder record.EventRecorder, log log
 		return nil, err
 	}
 	if storageClass == nil {
-		// If SC was not found, look for PV with this SC name
-		pv, err := getPV(client, pvcSpec, dv.Name, dv.Namespace)
-		if err != nil {
+		if err := updatePvcSpecFromPvcOrPv(client, pvcSpec, pvc); err != nil {
 			return nil, err
 		}
-		if pv != nil {
-			pvcSpec.VolumeMode = pv.Spec.VolumeMode
-			if len(pvcSpec.AccessModes) == 0 {
-				pvcSpec.AccessModes = pv.Spec.AccessModes
-			}
-		}
 		// Not even default storageClass on the cluster, cannot apply the defaults, verify spec is ok
 		if len(pvcSpec.AccessModes) == 0 {
 			log.V(1).Info("Cannot set accessMode for new pvc", "namespace", dv.Namespace, "name", dv.Name)
@@ -160,35 +152,39 @@ func copyStorageAsPvc(log logr.Logger, storage *cdiv1.StorageSpec) *v1.Persisten
 	return pvcSpec
 }
 
-// Gets either the bound PV or an available satisfying PV
-func getPV(c client.Client, pvcSpec *v1.PersistentVolumeClaimSpec, pvcName, pvcNamespace string) (*corev1.PersistentVolume, error) {
+// Update the PVC spec from either the created PVC or an available satisfying PV
+func updatePvcSpecFromPvcOrPv(c client.Client, pvcSpec *v1.PersistentVolumeClaimSpec, pvc *v1.PersistentVolumeClaim) error {
+	if pvc != nil {
+		pvcSpec.VolumeMode = pvc.Spec.VolumeMode
+		if len(pvcSpec.AccessModes) == 0 {
+			pvcSpec.AccessModes = pvc.Spec.AccessModes
+		}
+		return nil
+	}
+
 	if pvcSpec.StorageClassName == nil {
-		return nil, nil
+		return nil
 	}
 
 	pvList := &v1.PersistentVolumeList{}
 	fields := client.MatchingFields{claimStorageClassNameField: *pvcSpec.StorageClassName}
 	if err := c.List(context.TODO(), pvList, fields); err != nil {
-		return nil, err
-	}
-	for _, pv := range pvList.Items {
-		if pv.Status.Phase == corev1.VolumeBound &&
-			pv.Spec.ClaimRef != nil &&
-			pv.Spec.ClaimRef.Name == pvcName &&
-			pv.Spec.ClaimRef.Namespace == pvcNamespace {
-			return &pv, nil
-		}
+		return err
 	}
 	for _, pv := range pvList.Items {
 		if pv.Status.Phase == corev1.VolumeAvailable {
 			pvc := &corev1.PersistentVolumeClaim{Spec: *pvcSpec}
 			if err := checkVolumeSatisfyClaim(&pv, pvc); err == nil {
-				return &pv, nil
+				pvcSpec.VolumeMode = pv.Spec.VolumeMode
+				if len(pvcSpec.AccessModes) == 0 {
+					pvcSpec.AccessModes = pv.Spec.AccessModes
+				}
+				return nil
 			}
 		}
 	}
 
-	return nil, nil
+	return nil
 }
 
 func getDefaultVolumeAndAccessMode(c client.Client, storageClass *storagev1.StorageClass) ([]v1.PersistentVolumeAccessMode, *v1.PersistentVolumeMode, error) {

tests/datavolume_test.go

@@ -2421,7 +2421,7 @@ var _ = Describe("[vendor:cnv-qe@redhat.com][level:component]DataVolume tests",
 			err = utils.WaitForPersistentVolumeClaimPhase(f.K8sClient, dataVolume.Namespace, v1.ClaimBound, dataVolume.Name)
 			Expect(err).ToNot(HaveOccurred())
 
-			By("waiting for dv succeeeded")
+			By("waiting for dv succeeded")
 			err = utils.WaitForDataVolumePhase(f, dataVolume.Namespace, cdiv1.Succeeded, dataVolume.Name)
 			Expect(err).ToNot(HaveOccurred())
 		},
@@ -2479,7 +2479,7 @@ var _ = Describe("[vendor:cnv-qe@redhat.com][level:component]DataVolume tests",
 			err = utils.WaitForPersistentVolumeClaimPhase(f.K8sClient, dataVolume.Namespace, v1.ClaimBound, dataVolume.Name)
 			Expect(err).ToNot(HaveOccurred())
 
-			By("waiting for dv succeeeded")
+			By("waiting for dv succeeded")
 			err = utils.WaitForDataVolumePhase(f, dataVolume.Namespace, cdiv1.Succeeded, dataVolume.Name)
 			Expect(err).ToNot(HaveOccurred())
 		},