Skip to content

[release/2.2] Fix image defaults on Darwin to usable configuration #12544

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

Jump to bottom
Merged
AkihiroSuda merged 5 commits into from
Nov 21, 2025
Merged

[release/2.2] Fix image defaults on Darwin to usable configuration #12544

AkihiroSuda merged 5 commits into from
Nov 21, 2025

Conversation

@k8s-infra-cherrypick-robot
Copy link

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot commented Nov 19, 2025

This is an automated cherry-pick of #12533

/assign dmcgowan

@dmcgowan
Update default erofs block size on macOS during erofs diff
eeb0f88 
Use the Linux default rather than the block size from the local macOS
system. The local macOS block size is not relevant as the erofs file
will not be mounted directly on macOS.

Signed-off-by: Derek McGowan <derek@mcg.dev>
@dmcgowan
Use default writable size in erofs snapshotter for non-Linux hosts
9da9768 
Non-Linux hosts are not expected to be able to directly mount erofs
snapshotters on the host system. Non-Linux hosts should use block mode
by default with a reasonably set default block size.

Signed-off-by: Derek McGowan <derek@mcg.dev>
@dmcgowan
Update default differs on darwin
2055d3c 
Use the erofs differ by default on darwin. This could be default for all
Unix platforms but limit the default changes to fix broken cases for backports.

Signed-off-by: Derek McGowan <derek@mcg.dev>
@dmcgowan
Fix transfer unpack defaults on darwin
0936421 
Fix the default unpack configuration on darwin to a usable
configuration.

Signed-off-by: Derek McGowan <derek@mcg.dev>
@dmcgowan
Update the ctr pull defaults when using the transfer service
d154e23 
Match the defaults set by the transfer service which will configure
linux by default on darwin hosts.

Signed-off-by: Derek McGowan <derek@mcg.dev>
@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Nov 19, 2025
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Nov 19, 2025
Merged
@dosubot dosubot bot added the area/distribution Image Distribution label Nov 19, 2025
@hsiangkao
Copy link
Member

hsiangkao commented Nov 19, 2025 

=== FAIL: core/mount/manager TestLoopbackMount (0.07s)
    log_hook.go:47: time="2025-11-19T00:23:15.557630830Z" level=debug msg="activating mount" func="manager.(*mountManager).Activate" file="/home/runner/work/containerd/containerd/core/mount/manager/manager.go:134" mounts="[{loop /tmp/TestLoopbackMount581986403/001/fs-1352655250  []} {format/ext4 {{ mount 0 }}  []}]" name=id1 testcase=TestLoopbackMount
    helpers.go:100: unmount /tmp/TestLoopbackMount581986403/001/test-mount-3644850342
    manager_linux_test.go:80: 
        	Error Trace:	/home/runner/work/containerd/containerd/core/mount/manager/manager_linux_test.go:80
        	            				/home/runner/work/containerd/containerd/core/mount/manager/manager_linux_test.go:105
        	Error:      	Received unexpected error:
        	            	failed to get loop device info: no such device or address
        	Test:       	TestLoopbackMount

ENXIO came from https://github.com/torvalds/linux/blob/v6.17/drivers/block/loop.c#L1291
It seems the most possible reason is fd is invalid (maybe closed by others), but not sure why it could happen.

@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Nov 21, 2025
@AkihiroSuda AkihiroSuda merged commit b0731e8 into containerd:release/2.2 Nov 21, 2025
128 of 132 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Nov 21, 2025
@dmcgowan dmcgowan added impact/changelog area/distribution Image Distribution and removed area/distribution Image Distribution labels Dec 11, 2025
@dmcgowan dmcgowan mentioned this pull request Dec 12, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@hsiangkao hsiangkao hsiangkao approved these changes

Assignees

@dmcgowan dmcgowan

Labels

area/distribution Image Distribution impact/changelog size/L

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@k8s-infra-cherrypick-robot @hsiangkao @AkihiroSuda @dmcgowan @k8s-ci-robot