Skip to content

[release/2.1] Fix check of wrapped errors in erofs snapshotter#11935

Merged
dmcgowan merged 1 commit intocontainerd:release/2.1from
k8s-infra-cherrypick-robot:cherry-pick-11934-to-release/2.1
Jun 4, 2025
Merged

[release/2.1] Fix check of wrapped errors in erofs snapshotter#11935
dmcgowan merged 1 commit intocontainerd:release/2.1from
k8s-infra-cherrypick-robot:cherry-pick-11934-to-release/2.1

Conversation

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

This is an automated cherry-pick of #11934

/assign hsiangkao

Commit fb6dd2c ("client:improve mount error message") changed
the return value into a wraped error message, which causes the
ENOTBLK check doesn't work.

Reported-by: Aadhar Agarwal <[email protected]>
Fixes: containerd#11861
Signed-off-by: Gao Xiang <[email protected]>
@k8s-ci-robot
Copy link
Copy Markdown

@k8s-infra-cherrypick-robot: GitHub didn't allow me to assign the following users: hsiangkao.

Note that only containerd members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

Details

In response to this:

This is an automated cherry-pick of #11934

/assign hsiangkao

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.

@k8s-ci-robot
Copy link
Copy Markdown

Hi @k8s-infra-cherrypick-robot. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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.

@hsiangkao
Copy link
Copy Markdown
Member

/retest

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Jun 4, 2025
@dmcgowan dmcgowan merged commit 6d88d93 into containerd:release/2.1 Jun 4, 2025
101 of 102 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 dmcgowan changed the title [release/2.1] erofs-snapshotter: fix to work with wrapped errors [release/2.1] Fix check of wrapped errors in erofs snapshotter Jun 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

6 participants