Add refcounts to graphdrivers that use fsdiff #22168
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
cpuguy83
force-pushed
the
22116_hack_in_layer_refcounts
branch
from
0a63c60 to
9f277e8
Compare
cpuguy83
force-pushed
the
22116_hack_in_layer_refcounts
branch
3 times, most recently
from
e16f0ef to
f8085d1
Compare
|
icecrime
added
the
status/failing-ci
cpuguy83
force-pushed
the
22116_hack_in_layer_refcounts
branch
from
f8085d1 to
8b3cd7a
Compare
cpuguy83
removed
the
status/failing-ci
|
all 💚 |
| @@ -338,7 +339,7 @@ func (d *Driver) Remove(id string) error { | |||
| } | |||
|
|
|||
| // Get creates and mounts the required file system for the given id and returns the mount path. | |||
| func (d *Driver) Get(id string, mountLabel string) (string, error) { | |||
| func (d *Driver) Get(id string, mountLabel string) (_ string, retErr error) { | |||
There was a problem hiding this comment.
I've never seen this done before. (_ string). I don't know if this is cool or something horrid
cpuguy83
force-pushed
the
22116_hack_in_layer_refcounts
branch
from
8b3cd7a to
a6a01b1
Compare
This makes sure fsdiff doesn't try to unmount things that shouldn't be. **Note**: This is intended as a temporary solution to have as minor a change as possible for 1.11.1. A bigger change will be required in order to support container re-attach. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
cpuguy83
force-pushed
the
22116_hack_in_layer_refcounts
branch
from
a6a01b1 to
7342060
Compare
|
LGTM |
|
@cpuguy83 Is it ok that the |
|
@tonistiigi It's overall racey I think in terms of the reference counting, but not likely to be a problem in this scenario. |
|
LGTM |
|
LGTM |
|
Any chance this is causing the following issue. In one window In another window Run it a second time. |
|
@rhatdan Yes, most likely. Note this whole patch is reworked for 1.12 to support the daemon restore case, so please take a look at master as well! |
|
Yes I will try it there. |
Merged
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.
This makes sure fsdiff doesn't try to unmount things that shouldn't be.
Note: This is intended as a temporary solution to have as minor a
change as possible for 1.11.1. A bigger change will be required in order
to support container re-attach.
Fixes #22116