ops: fix deadlock on releasing shared mounts #1355
Merged
tonistiigi merged 3 commits intomoby:masterfrom Feb 21, 2020
Merged
Conversation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
hinshun
reviewed
Feb 11, 2020
| } | ||
|
|
||
| var cacheRefReleaseHijack func() | ||
| var cacheRefCloneHijack func() |
Collaborator
There was a problem hiding this comment.
If we move these to a context value, the tests can be run in parallel.
Member
Author
There was a problem hiding this comment.
Extra code needed for that isn't probably worth it. clone() doesn't even take a context atm.
AkihiroSuda
approved these changes
Feb 21, 2020
hinshun
approved these changes
Feb 21, 2020
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
3 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.
fix #1322
regression from 7b1bae7#diff-0d2115e5c32fba316a7eaa987331881cR228
#1092 added another global lock to protect writes to the global map of shared cache mounts. Because the lock is taken too early if conflicts with the locking order of the release method. In case the first shared cache mount is released at the same time another mount is taken with the same key locks are held in the opposite order leading to a deadlock. This PR fixes the ordering issue and makes sure the global lock is not taken before it is needed, improving the efficiency of the mounts with locking sharing mode.
Refactored code to allow unit tests. Tests added for the deadlock case and for all of the sharing methods.
@cpuguy83