Skip to content

transfer: fix the differ selection if differ is ""#13080

Merged
mxpv merged 1 commit intocontainerd:mainfrom
erofs:transfer-differ-fix
Mar 23, 2026
Merged

transfer: fix the differ selection if differ is ""#13080
mxpv merged 1 commit intocontainerd:mainfrom
erofs:transfer-differ-fix

Conversation

@hsiangkao
Copy link
Copy Markdown
Member

@hsiangkao hsiangkao commented Mar 21, 2026 •
edited
Loading

We must use the platforms supported by the differ to match the platform in UnpackConfiguration.

For example, a differ might only support "linux/amd64", while the platform in UnpackConfiguration is "linux(+erofs)/amd64";
Currently the logic is reversed, so that the wrong differ will be applied, as below:

// the wrong logic
if target[`linux(+erofs)/amd64`].Match(p[`linux/amd64`]) {

And

func (m *matcher) Match(platform specs.Platform) bool {
	normalized := Normalize(platform)
	if m.OS == normalized.OS &&
		m.Architecture == normalized.Architecture &&
		m.Variant == normalized.Variant &&
		m.matchOSVersion(platform) {
		if len(normalized.OSFeatures) == 0 { // `linux/amd64` should always match incorrectly.
			return true
		}

It should use all potential differs' capablities to match the corresponding platform requirements:

if platforms.Only(pd)`linux/amd64`.Match(p`linux(+erofs)/amd64`) {

-- A dependency patch of EROFS image osfeature support

@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Mar 21, 2026
@hsiangkao hsiangkao requested a review from dmcgowan March 21, 2026 07:32
@hsiangkao hsiangkao requested a review from fuweid March 21, 2026 07:32
@dosubot dosubot Bot added area/distribution Image Distribution kind/bug labels Mar 21, 2026
@hsiangkao hsiangkao mentioned this pull request Mar 23, 2026
Merged
@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Mar 23, 2026
@hsiangkao
Copy link
Copy Markdown
Member Author

hsiangkao commented Mar 23, 2026

thanks @dmcgowan @djdongjin , @containerd/committers could help merge this one?

ChengyuZhu6
ChengyuZhu6 approved these changes Mar 23, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@ChengyuZhu6 ChengyuZhu6 left a comment

Choose a reason for hiding this comment

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

LGTM

@dmcgowan dmcgowan added this pull request to the merge queue Mar 23, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Mar 23, 2026
@mxpv mxpv added this pull request to the merge queue Mar 23, 2026
Merged via the queue into containerd:main with commit 1568602 Mar 23, 2026
54 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Mar 23, 2026
@hsiangkao hsiangkao deleted the transfer-differ-fix branch March 24, 2026 02:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@djdongjin djdongjin djdongjin approved these changes

@fuweid fuweid Awaiting requested review from fuweid

@samuelkarp samuelkarp Awaiting requested review from samuelkarp

@AkihiroSuda AkihiroSuda Awaiting requested review from AkihiroSuda

+1 more reviewer

@ChengyuZhu6 ChengyuZhu6 ChengyuZhu6 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/distribution Image Distribution kind/bug size/S

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@hsiangkao @dmcgowan @djdongjin @ChengyuZhu6 @mxpv @k8s-ci-robot