DV Recreated with Wrong Status (#3912)

* Add check during updateStatus that prevents DVs from updating
its status from a PVC that is marked for deletion

Signed-off-by: dsanatar <[email protected]>

* add unit test to make sure PVCs marked for deletion do not
update the status of existing DVs

Signed-off-by: dsanatar <[email protected]>

---------

Signed-off-by: dsanatar <[email protected]>

Author: Dsanatar

pkg/controller/datavolume/controller-base.go

@@ -916,7 +916,7 @@ func (r *ReconcilerBase) updateStatus(req reconcile.Request, phaseSync *statusPh
 
 	if shouldSetDataVolumePending(pvc, dataVolumeCopy) {
 		dataVolumeCopy.Status.Phase = cdiv1.Pending
-	} else if pvc != nil {
+	} else if pvc != nil && pvc.DeletionTimestamp == nil {
 		dataVolumeCopy.Status.ClaimName = pvc.Name
 
 		phase := pvc.Annotations[cc.AnnPodPhase]

pkg/controller/datavolume/import-controller_test.go

@@ -1466,6 +1466,44 @@ var _ = Describe("All DataVolume Tests", func() {
 			Expect(readyCondition.Message).To(Equal(""))
 		})
 
+		It("Should not use PVC to update status if PVC is marked for deletion", func() {
+			dv := NewImportDataVolume("test-dv")
+			annotations := map[string]string{
+				AnnPopulatedFor: "test-dv",
+				AnnPodPhase:     string(corev1.PodSucceeded),
+			}
+			pvc := CreatePvc("test-dv", metav1.NamespaceDefault, annotations, nil)
+			// Set finalizer so PVC is not removed when Delete is called
+			pvc.Finalizers = append(pvc.Finalizers, "test-finalizer")
+
+			reconciler = createImportReconciler(dv, pvc)
+			_, err := reconciler.Reconcile(context.TODO(), reconcile.Request{NamespacedName: types.NamespacedName{Name: "test-dv", Namespace: metav1.NamespaceDefault}})
+			Expect(err).ToNot(HaveOccurred())
+
+			By("Marking PVC for deletion")
+			err = reconciler.client.Delete(context.TODO(), pvc)
+			Expect(err).ToNot(HaveOccurred())
+
+			By("Resetting DV to Pending phase")
+			pendingStatus := cdiv1.Pending
+			dv = &cdiv1.DataVolume{}
+			err = reconciler.client.Get(context.TODO(), types.NamespacedName{Name: "test-dv", Namespace: metav1.NamespaceDefault}, dv)
+			Expect(err).ToNot(HaveOccurred())
+			dv.Status.Phase = pendingStatus
+			err = reconciler.client.Status().Update(context.TODO(), dv)
+			Expect(err).ToNot(HaveOccurred())
+
+			By("Calling updateStatus")
+			_, err = reconciler.updateStatus(getReconcileRequest(dv), nil, reconciler)
+			Expect(err).ToNot(HaveOccurred())
+
+			By("Checking DV did not inherit new status from PVC")
+			dv = &cdiv1.DataVolume{}
+			err = reconciler.client.Get(context.TODO(), types.NamespacedName{Name: "test-dv", Namespace: metav1.NamespaceDefault}, dv)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(dv.Status.Phase).To(Equal(pendingStatus))
+		})
+
 		It("Should switch to paused if pod phase is succeeded but a checkpoint is set", func() {
 			reconciler = createImportReconciler(NewImportDataVolume("test-dv"))
 			_, err := reconciler.Reconcile(context.TODO(), reconcile.Request{NamespacedName: types.NamespacedName{Name: "test-dv", Namespace: metav1.NamespaceDefault}})