Skip to content

Fix DPA reconcile race: use MergeFrom patch for status update #2353

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

Merged
openshift-merge-bot merged 2 commits into from
Aug 5, 2026
Merged

Fix DPA reconcile race: use MergeFrom patch for status update #2353

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
139b2ef
fix: use MergeFrom patch for DPA status update to avoid conflicts
kaovilai Aug 4, 2026
0992b55
fix: correct comment on why MergeFrom patch avoids status conflicts
kaovilai Aug 4, 2026
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
8 changes: 7 additions & 1 deletion internal/controller/dataprotectionapplication_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ func (r *DataProtectionApplicationReconciler) Reconcile(ctx context.Context, req
logger.Error(err, "unable to fetch DataProtectionApplication CR")
return result, nil
}
// origDpa snapshots status before reconciliation mutates it, so the final
// status update is a merge patch (no resourceVersion check) instead of a
// full update, avoiding optimistic-lock conflicts when the informer cache
// still lags behind a status write this controller (or another actor)
// already made to the object.
origDpa := r.dpa.DeepCopy()

// set client to pkg/client for use in non-reconcile functions
oadpclient.SetClient(r.Client)
Expand Down Expand Up @@ -149,7 +155,7 @@ func (r *DataProtectionApplicationReconciler) Reconcile(ctx context.Context, req
}
}

statusErr := r.Client.Status().Update(ctx, r.dpa)
statusErr := r.Client.Status().Patch(ctx, r.dpa, client.MergeFrom(origDpa))

@coderabbitai coderabbitai Bot Aug 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🩺 Stability & Availability | 🟡 Minor | ⚡ Quick win

Preserve the status patch error.

When err is already non-nil, statusErr is discarded. Combine both errors so the original reconciliation failure remains available and the status persistence failure is not silently ignored.

As per path instructions, **/*.go: “Never ignore error returns.”

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@internal/controller/dataprotectionapplication_controller.go` at line 158,
Update the status patch handling in the reconciliation method containing
statusErr so any existing err is combined with statusErr instead of being
overwritten or discarded. Preserve both the original reconciliation failure and
the status persistence failure, and ensure the Status().Patch error is never
ignored.

Source: Path instructions

if err == nil { // Don't mask previous error
err = statusErr
}
Expand Down