Skip to content

[release/1.5] Fix pull fails on unexpected EOF#6117

Merged
estesp merged 1 commit intocontainerd:release/1.5from
Kern--:fix-failed-precondition
Oct 12, 2021
Merged

[release/1.5] Fix pull fails on unexpected EOF#6117
estesp merged 1 commit intocontainerd:release/1.5from
Kern--:fix-failed-precondition

Conversation

@Kern--
Copy link
Copy Markdown

@Kern-- Kern-- commented Oct 12, 2021

Cherry-picked from PR #5921

@ktock
Fix pull fails on unexpected EOF
aa7c9d9 
Currently, containerd doesn't restart pull when it encounters unexpected EOF of
blob strem withtout error codes.
There are cases where this lead to pull failure.
This commit tries to fix this issue.

Signed-off-by: Kohei Tokunaga <[email protected]>
(cherry picked from commit 7bc5aa7)
Signed-off-by: Kern Walster <[email protected]>
@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Oct 12, 2021

Hi @Kern--. 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/test-infra repository.

estesp
estesp approved these changes Oct 12, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 12, 2021

Build succeeded.

kzys
kzys approved these changes Oct 12, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@kzys kzys left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good to me. Do we need to do git cherry-pick -x? It adds "(cherry picked from commit ...)" message.

@estesp
Copy link
Copy Markdown
Member

estesp commented Oct 12, 2021

@kzys it's there in the commit :)

Signed-off-by: Kohei Tokunaga <[email protected]>
(cherry picked from commit 7bc5aa7)

@estesp estesp merged commit cad8793 into containerd:release/1.5 Oct 12, 2021
@dcantah dcantah mentioned this pull request Jan 3, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kzys kzys kzys approved these changes

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

needs-ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Kern-- @k8s-ci-robot @estesp @kzys @ktock