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

Merge branch 'release-1.12' into release-1.12

Browse Source
This commit is contained in:
Xun Jiang/Bruce Jiang
2024-01-09 10:31:41 +08:00
committed by GitHub
parent 03bad256b0 cf7074f943
commit 5a178b88d1
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/unreleased/7283-Lyndon-Li
+1
View File
@@ -0,0 +1 @@
Fix issue #6928, remove snapshot deletion timeout for PVB
pkg/controller/backup_deletion_controller.go
+1 -5
View File
@@ -59,7 +59,6 @@ import (
)
const (
snapshotDeleteTimeout = time.Minute
deleteBackupRequestMaxAge = 24 * time.Hour
)
@@ -513,12 +512,9 @@ func (r *backupDeletionReconciler) deletePodVolumeSnapshots(ctx context.Context,
return []error{err}
}
ctx2, cancelFunc := context.WithTimeout(ctx, snapshotDeleteTimeout)
defer cancelFunc()
var errs []error
for _, snapshot := range snapshots {
if err := r.repoMgr.Forget(ctx2, snapshot); err != nil {
if err := r.repoMgr.Forget(ctx, snapshot); err != nil {
errs = append(errs, err)
}
}