Add support for EROFS fsmerge feature #12374
Merged
Conversation
This file contains hidden or 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
96934d4 to
6076bcb
Compare
6076bcb to
69d2a33
Compare
4a2b254 to
fca4a46
Compare
10 tasks
fca4a46 to
53d11cc
Compare
19056af to
c93c21d
Compare
c93c21d to
84a35fc
Compare
2359163 to
8de5fb9
Compare
fuweid
reviewed
Nov 25, 2025
plugins/snapshots/erofs/erofs.go
Outdated
| td = "" | ||
|
|
||
| if !strings.Contains(key, snapshots.UnpackKeyPrefix) { | ||
| s.generateFsMeta(ctx, snap.ParentIDs) |
Member
There was a problem hiding this comment.
Is it possible to handle this outside the transaction, in case the command gets stuck?
Member
There was a problem hiding this comment.
it looks like it's nice to have. so it should be safe to move it outside the transaction
Member
Author
There was a problem hiding this comment.
very sorry about this, I thought I replied this but it seems not, yeah, I've moved the generation part out the transaction, thanks for your suggestion!
3a9e16e to
79d8783
Compare
azr
reviewed
Dec 11, 2025
azr
reviewed
Dec 11, 2025
79d8783 to
c7cd13c
Compare
Member
Author
|
@dmcgowan @fuweid @azr @AkihiroSuda @cpuguy83 |
e8502d4 to
f5400b5
Compare
cpuguy83
approved these changes
Dec 16, 2025
Member
cpuguy83
left a comment
There was a problem hiding this comment.
LGTM, although it doesn't look like it's being tested.
Member
Author
I tried, but then I found I'm not sure how to handle this easily, could we address the tests later? |
djdongjin
approved these changes
Dec 29, 2025
EROFS has supported a tiny metadata-only image to reference external blobs since Linux 5.16. This eliminates the need to mount each EROFS layer one by one and is also useful for VM-based containers (e.g. nerdbox and Kata containers.) Similar to LCOW/CimFS, `snapshots.UnpackKeyPrefix` is used to trigger fsmerge generation (typically < 100 ms) on demand in Prepare(). In the future, we can also generate fsmeta in Commit() of the final unpacking layer (by introducing an annotation to keep the chainID). However, in the case of intermediate layer reuse, the Prepare() handling will still be required. ```toml [plugins."io.containerd.snapshotter.v1.erofs"] max_unmerged_layers = 1 # enable fsmerge if image layers >= 2 ``` Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
f5400b5 to
9a7500a
Compare
djdongjin
approved these changes
Dec 30, 2025
AkihiroSuda
approved these changes
Dec 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
a prerequisite for containerd/nerdbox#30
EROFS has supported a tiny metadata-only image to reference external blobs since Linux 5.16. This eliminates the need to mount each EROFS layer one by one and is also useful for VM-based containers (e.g. nerdbox and Kata containers.)
Similar to LCOW/CimFS,
snapshots.UnpackKeyPrefixis used to trigger fsmerge generation (typically < 100 ms) on demand in Prepare().In the future, we can also generate fsmeta in Commit() of the final unpacking layer (by introducing an annotation to keep the chainID). However, in the case of intermediate layer reuse, the Prepare() handling will still be required.
This change is based on #12333merged