Skip to content

erofs-snapshotter: fix to work with wrapped errors#11934

Merged
fuweid merged 1 commit intocontainerd:mainfrom
erofs:erofs-snapshotter
Jun 4, 2025
Merged

erofs-snapshotter: fix to work with wrapped errors#11934
fuweid merged 1 commit intocontainerd:mainfrom
erofs:erofs-snapshotter

Conversation

@hsiangkao
Copy link
Copy Markdown
Member

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

Thanks @aadhar-agarwal for reporting.

@hsiangkao
Copy link
Copy Markdown
Member Author

@hsiangkao
Copy link
Copy Markdown
Member Author

Since #11861 is already cherry-picked into v2.1, this fix should be backported to v2.1 too.

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

@thaJeztah thaJeztah added the cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch label Jun 3, 2025
@aadhar-agarwal
Copy link
Copy Markdown
Contributor

Tested this fix, and I do not see the error anymore. Thank you! :)

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: #11861
Signed-off-by: Gao Xiang <[email protected]>
@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 enabled auto-merge June 4, 2025 00:33
@dmcgowan dmcgowan added this pull request to the merge queue Jun 4, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jun 4, 2025
@fuweid fuweid added this pull request to the merge queue Jun 4, 2025
Merged via the queue into containerd:main with commit 280c7c6 Jun 4, 2025
88 of 90 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Jun 4, 2025
@hsiangkao
Copy link
Copy Markdown
Member Author

/cherry-pick release/2.1

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

@hsiangkao: new pull request created: #11935

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

cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch size/XS

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

8 participants