Sync to OADP 1.4 from OADP 1.5 #108
Open
+35
−10
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- 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]>
…03-to-oadp-1.5 [oadp-1.5] : feat: improve conflict resolution for HostedCluster and NodePool updates
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: 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 |
openshift-ci
bot
added
the
approved
oadp-1.5: Prepare for ART Konflux builds
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update to get latest 1.5 commits.
What this PR does / why we need it
Which issue(s) this PR fixes
Fixes #
Checklist