[release-3.7] Migrate: handle NotFound via resource matching and during conflicts #18287
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
This change fixes two issues with the migrate command:
1. It updates isNotFoundForInfo to compare the error's kind to the
info's resource as well as its kind. The server error's use the
resource value in places where the kind should be used. We simply
accept both now.
2. It updates DefaultRetriable to not fail on conflict errors if
they were caused by the deletion of the given resource.
The following shell based tests were used to stress the edge cases
that this change fixes. The migrate command will readily fail in
these tests without the fixes from this change.
In one shell we continuously create service accounts with random
names as fast as possible. The resource type is not relevant.
N=8
while true; do
((i=i%N)); ((i++==0)) && wait
oc create serviceaccount $((1 + RANDOM % 10000000)) &
done
In a second shell we try to continuously delete all service
accounts:
while true; do
oc delete sa --all
done
In a third shell we try to continuously migrate service accounts:
while true; do
oc adm migrate storage --include='serviceaccount' --confirm
done
Bug 1537751
Signed-off-by: Monis Khan <[email protected]>
openshift-ci-robot
added
the
size/M
|
/lgtm |
openshift-ci-robot
added
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.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
openshift-ci-robot
added
the
approved
|
/retest |
5 similar comments
|
/retest |
|
/retest |
|
/retest |
|
/retest |
|
/retest |
|
Automatic merge from submit-queue. |
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.
This is an automated cherry-pick of #18280
/assign enj