layerStore.Load(): avoid double-locking the mounts list for Save #425
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
If we need to re-save the layers list when we've loaded it, to either solve a duplicate name issue or to clean up a partially-constructed layer, don't make the mistake of attempting to take another lock on the mounts list. Signed-off-by: Nalin Dahyabhai <[email protected]>
Signed-off-by: Nalin Dahyabhai <[email protected]>
|
LGTM |
vrothberg
reviewed
Sep 11, 2019
| r.mountsLockfile.Lock() | ||
| defer r.mountsLockfile.Unlock() | ||
| defer r.mountsLockfile.Touch() | ||
| if err := r.saveLayers(); err != nil { |
There was a problem hiding this comment.
We could move the call to saveLayers() before acquiring the mountsLockfile (i.e., to line 419). It would further shorten the critical section.
|
LGTM, but one of the tests is having an unrelated lock issue. I'll try restarting. |
|
LGTM, and would like to see separate patch with @vrothberg optimization. |
|
@nalind the ubuntu test is failing :/ |
|
Same for #426. I vote for force merging. |
|
Force merging since the test is failing on other PRs as well. |
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.
If we need to re-save the layers list when we've loaded it, to either solve a duplicate name issue or to clean up a partially-constructed layer, don't make the mistake of attempting to take another lock on the mounts list.