From 0722927df25b20dd1bf7860cd09aa0b32efd339a Mon Sep 17 00:00:00 2001 From: Lyndon-Li Date: Mon, 8 Jan 2024 10:10:51 +0800 Subject: [PATCH] isue 6928: remove snapshot deletion timeout for PVB Signed-off-by: Lyndon-Li --- changelogs/unreleased/7283-Lyndon-Li | 1 + pkg/controller/backup_deletion_controller.go | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 changelogs/unreleased/7283-Lyndon-Li diff --git a/changelogs/unreleased/7283-Lyndon-Li b/changelogs/unreleased/7283-Lyndon-Li new file mode 100644 index 000000000..291a25210 --- /dev/null +++ b/changelogs/unreleased/7283-Lyndon-Li @@ -0,0 +1 @@ +Fix issue #6928, remove snapshot deletion timeout for PVB \ No newline at end of file diff --git a/pkg/controller/backup_deletion_controller.go b/pkg/controller/backup_deletion_controller.go index af439b834..30580aa71 100644 --- a/pkg/controller/backup_deletion_controller.go +++ b/pkg/controller/backup_deletion_controller.go @@ -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) } }