[24.0 backport] Restore active mount counts on live-restore #45824
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
neersighted
force-pushed
the
24.0_backport_fix_live_restore_local_vol_mounts
branch
from
a70be85
to
c10f6ae
Compare
|
Re-picked from 647c2a6 (as the original PR moved). |
|
Arf, looks like I missed that the containerd log changes were now also included in the PR on master, which causes things to fail miserably now |
thaJeztah
force-pushed
the
24.0_backport_fix_live_restore_local_vol_mounts
branch
from
c10f6ae
to
1fed2b0
Compare
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. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 647c2a6) Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
24.0_backport_fix_live_restore_local_vol_mounts
branch
from
1fed2b0
to
c24c37b
Compare
|
Fixed the missing imports after the updated version; diff --git a/volume/local/local.go b/volume/local/local.go
index 50f3c21c2d..f156ea2339 100644
--- a/volume/local/local.go
+++ b/volume/local/local.go
@@ -6,2 +6,3 @@ package local // import "github.com/docker/docker/volume/local"
import (
+ "context"
"encoding/json"
@@ -13,2 +14,3 @@ import (
+ "github.com/containerd/containerd/log"
"github.com/docker/docker/daemon/names"
diff --git a/volume/service/service.go b/volume/service/service.go
index a5615fe731..adc7fdb239 100644
--- a/volume/service/service.go
+++ b/volume/service/service.go
@@ -7,2 +7,3 @@ import (
+ "github.com/containerd/containerd/log"
"github.com/docker/docker/api/types" |
corhere
approved these changes
Jun 28, 2023
cpuguy83
approved these changes
Jun 28, 2023
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 647c2a6)
- 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)