[20.10 backport] Restore active mount counts on live-restore #45826
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
thaJeztah
added
status/2-code-review
impact/changelog
area/volumes
kind/bugfix
|
I messed up this one; looks like some other changes must be included |
The /containers/{id}/wait can return a 400 (invalid argument) error if
httputils.ParseForm() fails.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0e5929f)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit e444ac3) Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 0119f79) Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
I had to check what the actual size was, so added it to the const's documentation. While at it, also made use of it in a test, so that we're testing against the expected value, and changed one alias to be consistent with other places where we alias this import. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 821b4d4) Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
This should help with CI being unstable when generating the types (due to Go randomizing order). Unfortunately, the (file) names are a bit ugly, but addressing that in a follow-up. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit e4c6ca3) Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9060126) Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit f19ef20) Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
neersighted
force-pushed
the
20.10_backport_fix_live_restore_local_vol_mounts
branch
from
59e940c
to
690db28
Compare
|
I'm halfway through cherry-picking this (see what is pushed so far), but I'm not convinced it's worth taking to 20.10, as the changes are getting more invasive (e.g. I need to pull in #43632). WDYT @cpuguy83 @thaJeztah @corhere |
neersighted
force-pushed
the
20.10_backport_fix_live_restore_local_vol_mounts
branch
2 times, most recently
from
7ac6922
to
7fd251e
Compare
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 176f66d) Resolved conflicts: client/volume_inspect.go daemon/disk_usage.go integration/system/disk_usage_test.go volume/service/service.go Co-authored-by: Bjorn Neergaard <bjorn.neergaard@docker.com> Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
neersighted
force-pushed
the
20.10_backport_fix_live_restore_local_vol_mounts
branch
from
7fd251e
to
9ddd54f
Compare
|
I'd say don't bother for this branch as it's quite a corner case, and users would've had to deal with this for more than 3 years already, so 🤷 |
thaJeztah
removed
status/2-code-review
impact/changelog
area/volumes
kind/bugfix
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.
When live-restoring a container the volume driver needs be notified that there is an active mount for the volume.
Before this change the count is zero until the container stops and the uint64 overflows pretty much making it so the volume can never be removed until another daemon restart.
(cherry picked from commit 19d651c)
- What I did
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)