mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-07 05:46:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into vgdp-ms-resume-pvb-pvr

Browse Source
This commit is contained in:
lyndon-li
2025-06-24 11:34:53 +08:00
committed by GitHub
parent c7e87e02ee 95cd0a184a
commit 2afb55d64e
6 changed files with 95 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/pod_volume_backup_controller.go
View File

@@ -833,7 +833,7 @@ func UpdatePVBWithRetry(ctx context.Context, client client.Client, namespacedNam
err := client.Update(ctx, pvb)
if err != nil {
if apierrors.IsConflict(err) {
log.Warnf("failed to update PVB for %s/%s and will retry it", pvb.Namespace, pvb.Name)
log.Debugf("failed to update PVB for %s/%s and will retry it", pvb.Namespace, pvb.Name)
return false, nil
} else {
return false, errors.Wrapf(err, "error updating PVB with error %s/%s", pvb.Namespace, pvb.Name)