OCPBUGS-60684: feat: improve conflict resolution for HostedCluster and NodePool updates #103
Conversation
- Increase retry attempts from 5 to 10 for better conflict handling - Reduce initial retry delay from 1s to 500ms for faster resolution - Add 30 second cap to maximum wait time to prevent excessive delays - Improve logging messages for better debugging and monitoring - Add success confirmation logs for completed operations - Maintain consistent retry logic across both UpdateHostedCluster and UpdateNodepools functions This addresses the 'object has been modified' conflicts that occur during backup/restore operations when multiple processes modify HyperShift resources concurrently. The enhanced retry mechanism provides more robust handling of race conditions and controller conflicts. Signed-off-by: Juan Manuel Parrilla Madrid <[email protected]>
openshift-ci-robot
added
jira/valid-reference
|
@jparrill: This pull request references Jira Issue OCPBUGS-60684, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci
bot
added
the
approved
|
/jira refresh |
|
@jparrill: This pull request references Jira Issue OCPBUGS-60684, which is invalid:
Comment In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
|
||
| for _, hc := range hostedClusters.Items { | ||
| // Create a retry loop with exponential backoff | ||
| // Create a retry loop with improved backoff for better conflict resolution |
There was a problem hiding this comment.
This sounds like an AI updated comment :)
There was a problem hiding this comment.
I usually ask for a review before commit the code xD
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jparrill, kaovilai The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@jparrill: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
/jira refresh |
|
@jparrill: This pull request references Jira Issue OCPBUGS-60684, which is invalid:
Comment In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@jparrill: This pull request references Jira Issue OCPBUGS-60684, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
/jira backport oadp-1.5 |
|
@jparrill: The following backport issues have been created: Queuing cherrypicks to the requested branches to be created after this PR merges: In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
@openshift-ci-robot: once the present PR merges, I will cherry-pick it on top of In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
@jparrill: Jira Issue OCPBUGS-60684: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-60684 has been moved to the MODIFIED state. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
@openshift-ci-robot: new pull request created: #104 In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
What this PR does / why we need it
This addresses the 'object has been modified' conflicts that occur during backup/restore operations when multiple processes modify HyperShift resources concurrently. The enhanced retry mechanism provides more robust handling of race conditions and controller conflicts.
Which issue(s) this PR fixes
Fixes #OCPBUGS-60684