Skip to content

test: terminal error backup #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gabriele-wolfox wants to merge 1 commit into from
Closed

test: terminal error backup #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions internal/controller/backup_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

apiv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
cnpgiClient "github.com/cloudnative-pg/cloudnative-pg/internal/cnpi/plugin/client"
Expand Down Expand Up @@ -118,7 +119,7 @@ func (r *BackupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
var backup apiv1.Backup
if err := r.Get(ctx, req.NamespacedName, &backup); err != nil {
if apierrs.IsNotFound(err) {
return ctrl.Result{}, nil
return ctrl.Result{}, reconcile.TerminalError(err)
}
return ctrl.Result{}, err
}
Expand Down Expand Up @@ -254,7 +255,7 @@ func (r *BackupReconciler) startBackupManagedByInstance(
_ = resourcestatus.FlagBackupAsFailed(ctx, r.Client, &backup, &cluster, fmt.Errorf("while getting pod: %w", err))
r.Recorder.Eventf(&backup, "Warning", "FindingPod", "Error getting target pod: %s",
cluster.Status.TargetPrimary)
return &ctrl.Result{}, nil
return &ctrl.Result{}, reconcile.TerminalError(err)
}

contextLogger.Debug("Found pod for backup", "pod", pod.Name)
Expand Down Expand Up @@ -282,7 +283,7 @@ func (r *BackupReconciler) startBackupManagedByInstance(
r.Recorder.Eventf(&backup, "Warning", "Error", "Backup exit with error %v", err)
_ = resourcestatus.FlagBackupAsFailed(ctx, r.Client, &backup, &cluster,
fmt.Errorf("encountered an error while taking the backup: %w", err))
return &ctrl.Result{}, nil
return &ctrl.Result{}, reconcile.TerminalError(err)
}
return nil, nil
}
Expand Down Expand Up @@ -416,7 +417,7 @@ func (r *BackupReconciler) getCluster(
r.Recorder.Eventf(backup, "Warning", "FindingCluster",
"Error getting cluster %v, will not retry: %s", clusterName, err.Error())

return &ctrl.Result{}, nil
return &ctrl.Result{}, reconcile.TerminalError(err)
}

func (r *BackupReconciler) isValidBackupRunning(
Expand Down Expand Up @@ -536,7 +537,7 @@ func (r *BackupReconciler) reconcileSnapshotBackup(
}
r.Recorder.Eventf(backup, "Warning", "FindingPod", "Error getting target pod: %s",
cluster.Status.TargetPrimary)
return &ctrl.Result{}, nil
return &ctrl.Result{}, reconcile.TerminalError(err)
}

ctx = log.IntoContext(ctx, contextLogger.WithValues("targetPodName", targetPod.Name))
Expand Down
Loading