Skip to content

Fix transfer differ selection#11915

Merged
fuweid merged 3 commits intocontainerd:mainfrom
dmcgowan:fix-transfer-differ-selection
Jun 4, 2025
Merged

Fix transfer differ selection#11915
fuweid merged 3 commits intocontainerd:mainfrom
dmcgowan:fix-transfer-differ-selection

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

  1. Update differ selection in transfer service to prefer default

    Currently the erofs differ will be chosen and cause pulls to fail with not implemented errors.

    We should also consider whether the differ should have an export configuration which limits which snapshotters it should be used with

  2. Add debug log when transfer returns not implemented

    Currently the error details are not included in the output error and there is no log. One of the reasons a the transferer was skipped could be do to a specific component which is not implemented (such as trying to use erofs differ) or unsupported image (pulling schema1). This information is useful to find a bad configuration.

    We could also consider returning this error detail to the caller, it could be relevant in in the schema 1 case to indicate the image is not supported.

  3. Add more error details when unpack fails to extract

@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review May 29, 2025
@dosubot dosubot Bot added area/distribution Image Distribution kind/bug labels May 29, 2025
@dmcgowan dmcgowan added the cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch label May 29, 2025
@dmcgowan dmcgowan force-pushed the fix-transfer-differ-selection branch from c2d3640 to a612a28 Compare May 30, 2025 21:28
@dmcgowan dmcgowan moved this from Needs Triage to Review In Progress in Pull Request Review Jun 2, 2025
dmcgowan added 3 commits June 2, 2025 22:49
Currently the error details are not included in the output error and
there is no log. One of the reasons a the transferer was skipped could
be do to a specific component which is not implemented (such as trying
to use erofs differ) or unsupported image (pulling schema1). This
information is useful to find a bad configuration.

Signed-off-by: Derek McGowan <[email protected]>
Currently the erofs differ will be chosen and cause pulls to fail with
not implemented errors.

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan force-pushed the fix-transfer-differ-selection branch from a612a28 to 4f7c69a Compare June 3, 2025 06:02
@estesp estesp enabled auto-merge June 3, 2025 15:31
@estesp estesp added this pull request to the merge queue Jun 3, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jun 3, 2025
@fuweid fuweid added this pull request to the merge queue Jun 4, 2025
Merged via the queue into containerd:main with commit e1b3cfa Jun 4, 2025
124 of 128 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Jun 4, 2025
@dmcgowan
Copy link
Copy Markdown
Member Author

dmcgowan commented Jun 4, 2025

/cherry-pick release/2.1

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

@dmcgowan: new pull request created: #11936

Details

In response to this:

/cherry-pick release/2.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@dmcgowan dmcgowan added cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch and removed cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch labels Jun 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/distribution Image Distribution cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch kind/bug size/S

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

7 participants