[20.10 backport] cli/rm_test: Fix TestRemoveForce race condition #3944
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
Synchronize append on the `removed` slice with mutex because containerRemoveFunc is called in parallel for each removed container by `container rm` cli command. Also reduced the shared access area by separating the scopes of test cases. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit b811057)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
fixes #3916
Backport:
There was already an attempt to fix this test by #3753 but it seems that it only accounted for the races between the test cases, and not the
container rmitself callingcontainerRemoveFuncconcurrently.Synchronize append on the
removedslice with mutex becausecontainerRemoveFuncis called in parallel for each removed container bycontainer rmcli command.Also reduced the shared access area by separating the scopes of test cases.
Signed-off-by: Paweł Gronowski pawel.gronowski@docker.com
(cherry picked from commit b811057)