From c9e1ade1f7c3b52ac3a38ae853e79a507b33bf95 Mon Sep 17 00:00:00 2001 From: lyndon <98304688+Lyndon-Li@users.noreply.github.com> Date: Tue, 5 Sep 2023 10:58:28 +0800 Subject: [PATCH] fix issue 6753 (#6757) Signed-off-by: Lyndon-Li --- changelogs/unreleased/6757-Lyndon-Li | 1 + pkg/controller/restore_operations_controller.go | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) create mode 100644 changelogs/unreleased/6757-Lyndon-Li diff --git a/changelogs/unreleased/6757-Lyndon-Li b/changelogs/unreleased/6757-Lyndon-Li new file mode 100644 index 000000000..1e095ee67 --- /dev/null +++ b/changelogs/unreleased/6757-Lyndon-Li @@ -0,0 +1 @@ +Fix issue #6753, remove the check for read-only BSL in restore async operation controller since Velero cannot fully support read-only mode BSL in restore at present \ No newline at end of file diff --git a/pkg/controller/restore_operations_controller.go b/pkg/controller/restore_operations_controller.go index de7b96a76..417ef562b 100644 --- a/pkg/controller/restore_operations_controller.go +++ b/pkg/controller/restore_operations_controller.go @@ -139,18 +139,6 @@ func (r *restoreOperationsReconciler) Reconcile(ctx context.Context, req ctrl.Re return ctrl.Result{}, errors.Wrap(err, "error getting backup info") } - if info.location.Spec.AccessMode == velerov1api.BackupStorageLocationAccessModeReadOnly { - log.Infof("Cannot check progress on Restore operations because backup storage location %s is currently in read-only mode; marking restore PartiallyFailed", info.location.Name) - restore.Status.Phase = velerov1api.RestorePhasePartiallyFailed - restore.Status.CompletionTimestamp = &metav1.Time{Time: r.clock.Now()} - r.metrics.RegisterRestorePartialFailure(restore.Spec.ScheduleName) - err := r.updateRestoreAndOperationsJSON(ctx, original, restore, nil, &itemoperationmap.OperationsForRestore{ErrsSinceUpdate: []string{"BSL is read-only"}}, false, false) - if err != nil { - log.WithError(err).Error("error updating Restore") - } - return ctrl.Result{}, nil - } - pluginManager := r.newPluginManager(r.logger) defer pluginManager.CleanupClients() backupStore, err := r.backupStoreGetter.Get(info.location, pluginManager, r.logger)