fix: Retry operation on conflict #668
Merged
Conversation
This file contains 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
mjura
reviewed
Sep 20, 2024
yiannistri
force-pushed
the
665-retry-on-conflict
branch
2 times, most recently
from
c1600bd
to
5c62bac
Compare
salasberryfin
previously approved these changes
Sep 24, 2024
yiannistri
force-pushed
the
665-retry-on-conflict
branch
from
5c62bac
to
13b2fc8
Compare
mjura
approved these changes
Sep 27, 2024
|
Please backport this change to v2.9 |
yiannistri
added a commit
to yiannistri/aks-operator
that referenced
this pull request
Sep 27, 2024
fix: Retry operation on conflict (cherry picked from commit a261149)
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.
What this PR does / why we need it:
Occasionally when a conflict occurs during the reconciliation process, the
configobject that is returned is non-nil but empty, causing logs to be missing fields.Which issue(s) this PR fixes
Issue #665
Special notes for your reviewer:
To address the conflict, the RetryOnConflict function was used to query the resource and attempt the operation again, if the error returned is a conflict error.
Checklist: