Skip to content

Add support for mount manager #4568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2025
+12 −2
Merged

Add support for mount manager #4568

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8048966
Should use mount.UnmountMounts for unmounting submounts
hsiangkao Oct 31, 2025
2ba655a
Add support for mount manager
hsiangkao Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions pkg/cmd/container/run_mount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,20 @@ func generateMountOpts(ctx context.Context, client *containerd.Client, ensuredIm
return nil, nil, nil, err
}

mm := client.MountManager()

active, err := mm.Activate(ctx, tempDir, mounts)
if err == nil {
defer mm.Deactivate(ctx, tempDir)
mounts = active.System
} else if !errors.Is(err, errdefs.ErrNotImplemented) {
return nil, nil, nil, fmt.Errorf("failed to activate mounts: %w", err)
}

// windows has additional steps for mounting see
// https://github.com/containerd/containerd/commit/791e175c79930a34cfbb2048fbcaa8493fd2c86b
unmounter := func(mountPath string) {
if uerr := mount.Unmount(mountPath, 0); uerr != nil {
unmounter := func(tempDir string) {
if uerr := mount.UnmountMounts(mounts, tempDir, 0); uerr != nil {
log.G(ctx).Debugf("Failed to unmount snapshot %q", tempDir)
if err == nil {
err = uerr
Expand Down
Loading