Skip to content

Commit

Permalink
pb-5450: Added change to wait for the deletion of application pvc before
Browse files Browse the repository at this point in the history
switching to kdmp restore, when the csi restore failed.
  • Loading branch information
sivakumar subraani authored and lalat-das committed Feb 5, 2024
1 parent 86d0733 commit 02a2110
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkg/controllers/dataexport/reconcile.go
Original file line number Diff line number Diff line change
Expand Up @@ -1629,6 +1629,12 @@ func (c *Controller) cleanupLocalRestoredSnapshotResources(de *kdmpapi.DataExpor
if err := core.Instance().DeletePersistentVolumeClaim(pvcSpec.Name, de.Namespace); err != nil && !k8sErrors.IsNotFound(err) {
return nil, false, fmt.Errorf("delete %s/%s pvc: %s", de.Namespace, pvcSpec.Name, err)
}
// If local csi restore fails, we will delete the PVC created to restore from local csi snapshot.
// Will wait for the deletion of the PVC to complete by calling get PVC.
// Otherwise, the PVC creation in the kdmp snapshot restore, does not creates the new PVC as we will use same name.
if _, err := core.Instance().GetPersistentVolumeClaim(pvcSpec.Name, de.Namespace); (err != nil && !k8sErrors.IsNotFound(err)) || (err == nil) {
return nil, true, fmt.Errorf("get %v/%v pvc: %v", de.Namespace, pvcSpec.Name, err)
}
}
return nil, false, nil
}
Expand Down

0 comments on commit 02a2110

Please sign in to comment.