Hold the layer store lock while diffing #214
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
While generating a Diff, hold the lock on the layer store until after we've completely finished building the diff. There's an internal Mount/Unmount being done so that we can read the layer's contents, and we don't update the mount counts properly if we're not still holding the lock when the layer store's Unmount() method is called, which doesn't happen until the ReadCloser that Diff() returns gets closed. Signed-off-by: Nalin Dahyabhai <[email protected]>
|
LGTM assuming happy tests. |
|
LGTM |
|
Thanks everyone! |
|
This fixes the problem I was seeing with concurrent buildah bud and skopeo copy calls. |
This was referenced Sep 21, 2018
Closed
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.
While generating a Diff, hold the lock on the layer store until after we've completely finished building the diff.
There's an internal Mount/Unmount being done so that we can read the layer's contents, and we don't update the mount counts properly if we're not still holding the lock when the layer store's Unmount() method is called, and that doesn't happen until the ReadCloser that Diff() returns gets closed.
This should fix containers/buildah#981.