Skip to content

[oadp-1.4] Fix DPA reconcile race: use MergeFrom patch for status update #2358

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
kaovilai wants to merge 2 commits into
base: oadp-1.4
Choose a base branch
from
+7 −1
Open

[oadp-1.4] Fix DPA reconcile race: use MergeFrom patch for status update #2358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76e2439
fix: use MergeFrom patch for DPA status update to avoid conflicts
kaovilai Aug 4, 2026
b91f074
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 controllers/dpa_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ func (r *DPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
log.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 := dpa.DeepCopy()

// set client to pkg/client for use in non-reconcile functions
oadpClient.SetClient(r.Client)
Expand Down Expand Up @@ -128,7 +134,7 @@ func (r *DPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
},
)
}
statusErr := r.Client.Status().Update(ctx, &dpa)
statusErr := r.Client.Status().Patch(ctx, &dpa, client.MergeFrom(origDpa))
if err == nil { // Don't mask previous error
err = statusErr
}
Expand Down
Loading