[release-3.11] Do not retry conflicts during storage migration#21449
Merged
openshift-merge-robot merged 1 commit intoopenshift:release-3.11from Nov 8, 2018
Conversation
Storage migration is special in that all it needs to do is a no-op update to cause the API server to migrate the object to the preferred version. Thus if we encounter a conflict, we know that something updated the object and we no longer need to do anything. If the object needed migration, the API server has already migrated it. Signed-off-by: Monis Khan <mkhan@redhat.com>
openshift-ci-robot
added
the
size/XS
Contributor
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: enj, openshift-cherrypick-robot The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
Contributor
|
/retest |
juanluisvaladas
pushed a commit
to juanluisvaladas/origin
that referenced
this pull request
Feb 7, 2020
…21449-upstream-ose-enterprise-3.11 Automated cherry pick of openshift#21449 on enterprise-3.11
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This is an automated cherry-pick of #21437
/assign enj