Skip to content

Add mount manager#12063

Merged
fuweid merged 38 commits intocontainerd:mainfrom
dmcgowan:mount-manager
Oct 3, 2025
Merged

Add mount manager#12063
fuweid merged 38 commits intocontainerd:mainfrom
dmcgowan:mount-manager

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan commented Jul 7, 2025 •
edited
Loading

Implementation of #11303
Depends on #12025 merged

WIP Items:

  • Update implementation and testing complete
  • Moving runtime implementation down to the task manager complete
  • Passing runtime name to complete
  • More complete documentation complete
* **Add mount manager** ([#12063](https://github.com/containerd/containerd/pull/12063))

  The mount manager is a new service that provides lifecycle management for filesystem mounts
  to support more advanced use cases, such as:
  * **Device formatting** to create formatted filesystems (xfs, ext4) on-demand  
  * **Mount activation** to prepare devices such as loopbacks or network fileystems
  * **Mount transformation** to allow mount arguments to be filled in dynamically from previous mounts
  * **Garbage collection** of mounts to ensure temporary mounts are never leaked

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Jul 7, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Jul 7, 2025
@dmcgowan dmcgowan added this to the 2.2 milestone Jul 7, 2025
@hsiangkao hsiangkao mentioned this pull request Jul 10, 2025
Closed
@dmcgowan dmcgowan force-pushed the mount-manager branch 2 times, most recently from 6657f4b to 4195276 Compare September 3, 2025 23:47
@dmcgowan dmcgowan force-pushed the mount-manager branch 5 times, most recently from 1bc2cbb to f71db6f Compare September 6, 2025 06:38
@dmcgowan
Move transaction context to boltutil
37cec68 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Update metadata gc to run context finishes in parallel
1809f3e 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Add mount manager interface to mount package
c715986 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Add mount garbage collection resource
78ca11c 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Add mount manager plugin and types
ed03f3a 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Add loopback mount handler
55ff117 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Improve formatting and support for deactivate
f4b7b93 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Add mount manager tests
6243cf5 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Add mount activation integration test
67f0970 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Add mount manager documentation
61b8426 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Add mount manager format test
9c0cc4a 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Fix mount manager deactivate errors
fa32756 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Update snapshotter tests to use mount manager
9307096 
Create separate package for snapshotter test in metadata package to
prevent circular dependency.

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Use mount manager for temp mounts
069cbfe 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Update mount manager cleanup logic
f7b77e6 
Avoid keeping file descriptor open to directory which is getting
removed. Update error handling and wrapping to provide more clarity
around failures.

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Handle flaky case for loop autoclear
9c21e86 
The autoclear may take a bit of time to clear out the file, check
multiple times for the file to get removed before returning an error.

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Add option to allow formatted mounts
dd9c431 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Add runtimes option to task manager
efc9950 
Allow task manager to fetch info on runtimes at startup.
Use this info to configure whether the runtime allows formatted mounts.
This info could also be used in the future to enforce policy such as
requiring a pre-known set of runtimes or specific runtime properties.

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Add support for allowing custom types through mount manager
94e6bce 
Allow the mount manager to skip handling of custom types. Ensure that
custom types are still working with formatted mounts.

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan requested a review from Copilot September 30, 2025 00:27
Copilot AI reviewed Sep 30, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

Copilot reviewed 48 out of 58 changed files in this pull request and generated 3 comments.

Comments suppressed due to low confidence (1)

core/mount/manager/manager.go:1

  • The TODO comment 'IF has sync' is unclear and incomplete. It should be clarified to explain what condition should be checked or removed if no longer needed.
/*

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

Comment thread core/mount/losetup_linux_test.go
Comment thread core/runtime/v2/task_manager.go Outdated
Comment thread core/mount/manager/manager.go
@dmcgowan
Update runtime to read allowed custom mounts from runtime
f3af360 
Let the runtime specify which custom mounts it will support

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Update mount manager code documentation
c7b3114 
Signed-off-by: Derek McGowan <[email protected]>
fuweid
fuweid approved these changes Oct 3, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, LGTM

The change is huge. We need more e2e test for this in the follow-up, especially detecting leaky resources.

Comment thread core/metadata/snapshot_suite_test.go

// metadata_test is used to test the metadata snapshotter implementations
// against the snapshotter test suite.
package metadata_test
Copy link
Copy Markdown
Member

@fuweid fuweid Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since it's external package, maybe we can put this test in native plugin? it's not a blocker

@github-project-automation github-project-automation bot moved this from Needs Reviewers to Review In Progress in Pull Request Review Oct 3, 2025
@fuweid fuweid added this pull request to the merge queue Oct 3, 2025
Merged via the queue into containerd:main with commit 61ddcd5 Oct 3, 2025
135 of 138 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Oct 3, 2025
@dmcgowan dmcgowan mentioned this pull request Oct 3, 2025
Merged
This was referenced Oct 24, 2025
Merged
Merged
This was referenced Nov 5, 2025
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@fuweid fuweid fuweid approved these changes

@austinvazquez austinvazquez austinvazquez approved these changes

+1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

impact/changelog kind/feature size/XXL

Projects

Pull Request Review
Archived in project

Milestone

2.2

Development

Successfully merging this pull request may close these issues.

5 participants

@dmcgowan @k8s-ci-robot @fuweid @austinvazquez