[oadp-1.5] : feat: improve conflict resolution for HostedCluster and NodePool updates #104
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-cherrypick-robot: Could not make automatic cherrypick of Jira Issue OCPBUGS-60684 for this PR as the target version is not set for this branch in the jira plugin config. Running refresh: /retitle [oadp-1.5] : feat: improve conflict resolution for HostedCluster and NodePool updates 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
added
jira/valid-reference
|
@openshift-ci-robot: 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
changed the title
openshift-ci-robot
removed
jira/valid-reference
|
@openshift-cherrypick-robot: No Jira issue is referenced in the title of this pull 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. |
|
@openshift-cherrypick-robot: 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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kaovilai, openshift-cherrypick-robot 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 |
openshift-ci
bot
added
the
approved
This is an automated cherry-pick of #103
/assign openshift-ci-robot