mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-07-19 06:22:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use restorePV to cover retained and non-retained case

Browse Source 
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
This commit is contained in:
Lyndon-Li
2026-06-22 17:24:53 +08:00
parent 20a0def15d
commit eb0aa625ce
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/exposer/generic_restore.go
+11 -7
View File
@@ -450,6 +450,10 @@ func (e *genericRestoreExposer) rebindVolumeChangeMode(ctx context.Context, owne
}
}()
if retained != nil {
restorePV = retained
}
err = kube.EnsureDeletePod(ctx, e.kubeClient.CoreV1(), restorePodName, ownerObject.Namespace, param.OperationTimeout)
if err != nil {
return errors.Wrapf(err, "error to delete restore pod %s", restorePodName)
@@ -462,26 +466,26 @@ func (e *genericRestoreExposer) rebindVolumeChangeMode(ctx context.Context, owne
curLog.WithField("restore PVC", restorePVCName).Info("Restore PVC is deleted")
err = kube.WaitVolumeDetached(ctx, e.kubeClient.StorageV1(), retained.Name, param.OperationTimeout)
err = kube.WaitVolumeDetached(ctx, e.kubeClient.StorageV1(), restorePV.Name, param.OperationTimeout)
if err != nil {
return errors.Wrapf(err, "error waiting for retained PV %s to detach", retained.Name)
return errors.Wrapf(err, "error waiting for restore PV %s to detach", restorePV.Name)
}
curLog.WithField("retained PV", retained.Name).Info("Retained PV is detached")
curLog.WithField("restore PV", restorePV.Name).Info("Restore PV is detached")
rebindPV, err = kube.RebindPV(ctx, e.kubeClient.CoreV1(), uuid.NewString(), retained, targetPVC, orgReclaim, param.TargetFSType)
rebindPV, err = kube.RebindPV(ctx, e.kubeClient.CoreV1(), uuid.NewString(), restorePV, targetPVC, orgReclaim, param.TargetFSType)
if err != nil {
return errors.Wrapf(err, "error rebinding PV for target PVC %s", param.TargetPVCName)
}
curLog.WithField("rebind PV", rebindPV.Name).Info("Rebind PV is created")
err = kube.EnsureDeletePV(ctx, e.kubeClient.CoreV1(), retained.Name, param.OperationTimeout)
err = kube.EnsureDeletePV(ctx, e.kubeClient.CoreV1(), restorePV.Name, param.OperationTimeout)
if err != nil {
return errors.Wrapf(err, "error deleting PV %s", retained.Name)
return errors.Wrapf(err, "error deleting restore PV %s", restorePV.Name)
}
curLog.WithField("retained PV", retained.Name).Info("Retained PV is deleted")
curLog.WithField("restore PV", restorePV.Name).Info("Restore PV is deleted")
retained = nil
pkg/exposer/generic_restore_test.go
+2 -2
View File
@@ -480,7 +480,7 @@ func TestRebindVolume(t *testing.T) {
},
},
},
err: "error waiting for retained PV fake-restore-pv to detach: error listing volumeattachment: error listing volumeattachment: fake-list-error",
err: "error waiting for restore PV fake-restore-pv to detach: error listing volumeattachment: error listing volumeattachment: fake-list-error",
},
{
name: "[change mode] rebind pv fail",
@@ -528,7 +528,7 @@ func TestRebindVolume(t *testing.T) {
},
},
},
err: "error deleting PV fake-restore-pv: error to delete pv fake-restore-pv: fake-delete-error",
err: "error deleting restore PV fake-restore-pv: error to delete pv fake-restore-pv: fake-delete-error",
},
{
name: "[change mode] rebind target pvc fail",