vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove waiting during finalize 

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
pull/7046/head
Tiger Kaovilai 2023-11-02 16:16:27 -04:00
parent f9e716a8c9
commit 18acf005d6
No known key found for this signature in database
GPG Key ID: F05DADBB55627443
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/controller/backup_finalizer_controller.go
View File

@ -25,7 +25,6 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/util/retry"
clocks "k8s.io/utils/clock" clocks "k8s.io/utils/clock"
ctrl "sigs.k8s.io/controller-runtime" ctrl "sigs.k8s.io/controller-runtime"
kbclient "sigs.k8s.io/controller-runtime/pkg/client" kbclient "sigs.k8s.io/controller-runtime/pkg/client"
@ -191,16 +190,8 @@ func (r *backupFinalizerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
} }
backup.Status.CompletionTimestamp = &metav1.Time{Time: r.clock.Now()} backup.Status.CompletionTimestamp = &metav1.Time{Time: r.clock.Now()}
recordBackupMetrics(log, backup, outBackupFile, r.metrics, true) recordBackupMetrics(log, backup, outBackupFile, r.metrics, true)
CSISnapshotsNotReady := errors.New("CSI snapshots not ready")
retry.OnError(retry.DefaultBackoff, func(err error) bool {
return err == CSISnapshotsNotReady
}, func() error {
pkgbackup.UpdateBackupCSISnapshotsStatus(r.client, r.volumeSnapshotLister, backup, log) pkgbackup.UpdateBackupCSISnapshotsStatus(r.client, r.volumeSnapshotLister, backup, log)
if backup.Status.CSIVolumeSnapshotsCompleted < backup.Status.CSIVolumeSnapshotsAttempted {
return CSISnapshotsNotReady
}
return nil
})
// update backup metadata in object store // update backup metadata in object store
backupJSON := new(bytes.Buffer) backupJSON := new(bytes.Buffer)
if err := encode.To(backup, "json", backupJSON); err != nil { if err := encode.To(backup, "json", backupJSON); err != nil {