From c72014c550375afc0c0601436604114df22c764c Mon Sep 17 00:00:00 2001 From: James Lu Date: Mon, 19 Aug 2024 15:14:58 +0800 Subject: [PATCH] fix(backup): delete the snapshot directly by backup.Spec.SnapshotName Delete the snapshot directly by `backup.Spec.SnapshotName` when doing the automatic cleanup by deleting the backup. ref: longhorn/longhorn 9252 Signed-off-by: James Lu (cherry picked from commit 19ba220756a5a4ad7ee8b62b96573b9328fea234) --- controller/backup_controller.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/controller/backup_controller.go b/controller/backup_controller.go index f45d53516b..04c0c7bd09 100644 --- a/controller/backup_controller.go +++ b/controller/backup_controller.go @@ -325,20 +325,10 @@ func (bc *BackupController) reconcile(backupName string) (err error) { } if autocleanup { // do the best effort to delete the snapshot - snapshot, err := bc.ds.GetSnapshotRO(backup.Spec.SnapshotName) - if err != nil { - if !apierrors.IsNotFound(err) { - logrus.WithError(err).WithFields(logrus.Fields{ - "backup": backup.Name, - "snapshot": snapshot.Name, - }).Warn("Failed to get snapshot") - } - return nil - } - if err = bc.ds.DeleteSnapshot(snapshot.Name); err != nil { + if err = bc.ds.DeleteSnapshot(backup.Spec.SnapshotName); err != nil { logrus.WithError(err).WithFields(logrus.Fields{ "backup": backup.Name, - "snapshot": snapshot.Name, + "snapshot": backup.Spec.SnapshotName, }).Warn("Failed to delete snapshot") } }