Fix layer locking in CreateContainer #1387
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
- imageTopLayerForMapping, in the cParentLayer loop, was reading all additional layer stores, although only some of them might have been locked at that point. - getAutoUserNS -> getMaxSizeFromImage was assuming that all layer stores are locked, but in fact the additional layer stores were all unlocked at that point - getMaxSizeFromImage was calling store.getLayerStore() and the like, which could potentially trigger a reload via graphLock and return a _different_ store than the one that was locked So, lock _all_ layer stores in CreateContainer (at least on the path where images are involved), and pass the locked layer stores down the call stack. Also, document a bit more explicitly what's going on. Signed-off-by: Miloslav Trmač <[email protected]>
|
For the record, I would never just find this at staring at the code. (I don’t have that kind of patience and focus, for starters.) This is an outcome of prototyping lock tokens per #1389 . |
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.
imageTopLayerForMapping, in thecParentLayerloop, was reading all additional layer stores, although only some of them might have been locked at that point.getAutoUserNS→getMaxSizeFromImagewas assuming that all layer stores are locked, but in fact the additional layer stores were all unlocked at that pointgetMaxSizeFromImagewas callingstore.getLayerStore()and the like, which could potentially trigger a reload viagraphLockand return a different store than the one that was lockedSo, lock all layer stores in
CreateContainer(at least on the path where images are involved), and pass the locked layer stores down the call stack.Also, document a bit more explicitly what's going on.