Skip to content

[release-4.22] OCPBUGS-86024: Requeue PerformanceStatus update when status write fails #1518

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

Open
openshift-cherrypick-robot wants to merge 1 commit into
base: release-4.22
Choose a base branch
from
+7 −3
Open

[release-4.22] OCPBUGS-86024: Requeue PerformanceStatus update when status write fails #1518

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
10 changes: 7 additions & 3 deletions pkg/performanceprofile/controller/performanceprofile_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ import (
const (
openshiftFinalizer = "foreground-deletion"
hypershiftFinalizer = "hypershift.openshift.io/foreground-deletion"

// statusUpdateRequeueAfter is the delay before retrying reconcile after a failure to update performance profile status.
statusUpdateRequeueAfter = 30 * time.Second
)

// PerformanceProfileReconciler reconciles a PerformanceProfile object
Expand Down Expand Up @@ -615,13 +618,14 @@ func (r *PerformanceProfileReconciler) Reconcile(ctx context.Context, req ctrl.R
conditions := status.GetDegradedConditions(status.ConditionReasonComponentsCreationFailed, err.Error())
if err := r.StatusWriter.Update(ctx, instance, conditions); err != nil {
klog.Errorf("failed to update performance profile %q status: %v", instance.GetName(), err)
return reconcile.Result{}, err
return reconcile.Result{RequeueAfter: statusUpdateRequeueAfter}, nil
}
return reconcile.Result{}, err
}
err = r.StatusWriter.UpdateOwnedConditions(ctx, instance)
if err != nil {
klog.Errorf("failed to update performance profile %q status: %v", instance.GetName(), err)
return ctrl.Result{RequeueAfter: statusUpdateRequeueAfter}, nil
}
return ctrl.Result{}, nil
}
Expand Down Expand Up @@ -651,7 +655,7 @@ func (r *PerformanceProfileReconciler) getAndValidateMCP(ctx context.Context, in
conditions := status.GetDegradedConditions(status.ConditionFailedToFindMachineConfigPool, err.Error())
if err := r.StatusWriter.Update(ctx, profile, conditions); err != nil {
klog.Errorf("failed to update performance profile %q status: %v", profile.GetName(), err)
return nil, &reconcile.Result{}, err
return nil, &reconcile.Result{RequeueAfter: statusUpdateRequeueAfter}, nil
}
return nil, &reconcile.Result{}, nil
}
Expand All @@ -660,7 +664,7 @@ func (r *PerformanceProfileReconciler) getAndValidateMCP(ctx context.Context, in
conditions := status.GetDegradedConditions(status.ConditionBadMachineConfigLabels, err.Error())
if err := r.StatusWriter.Update(ctx, profile, conditions); err != nil {
klog.Errorf("failed to update performance profile %q status: %v", profile.GetName(), err)
return nil, &reconcile.Result{}, err
return nil, &reconcile.Result{RequeueAfter: statusUpdateRequeueAfter}, nil
}
return nil, &reconcile.Result{}, nil
}
Expand Down