Skip to content

[release/1.4] bugfix: change the flag of open log fifo to avoid containerd hang on syscall open#4971

Merged
fuweid merged 1 commit intocontainerd:release/1.4from
payall4u:bugfix/fix-open-shim-fifo-rebase
Feb 2, 2021
Merged

[release/1.4] bugfix: change the flag of open log fifo to avoid containerd hang on syscall open#4971
fuweid merged 1 commit intocontainerd:release/1.4from
payall4u:bugfix/fix-open-shim-fifo-rebase

Conversation

@payall4u
Copy link
Contributor

@payall4u payall4u commented Jan 26, 2021 •
edited by fuweid
Loading

Signed-off-by: Zhiyu Li payall4u@qq.com
(cherry picked from commit 957fa33)

Cherry-pick: #4906

@k8s-ci-robot
Copy link

k8s-ci-robot commented Jan 26, 2021

Hi @payall4u. 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.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Jan 26, 2021

Build succeeded.

@payall4u
Copy link
Contributor Author

payall4u commented Jan 26, 2021

@fuweid Done.

@AkihiroSuda AkihiroSuda marked this pull request as draft January 27, 2021 05:41
@AkihiroSuda
Copy link
Member

AkihiroSuda commented Jan 27, 2021

Marked as a draft, because #4906 is not merged yet.

After #4906 gets merged, please run git cherry-pick with -x to clarify the original commit hash.
https://git-scm.com/docs/git-cherry-pick

@payall4u
change flag from RDONLY to RDWR and close the fifo correct
edffc83 
Signed-off-by: Zhiyu Li <payall4u@qq.com>
(cherry picked from commit 957fa33)
@payall4u payall4u force-pushed the bugfix/fix-open-shim-fifo-rebase branch from adb7d60 to edffc83 Compare February 1, 2021 14:56
@estesp estesp mentioned this pull request Feb 1, 2021
Merged
@theopenlab-ci
Copy link

theopenlab-ci bot commented Feb 1, 2021

Build succeeded.

@k8s-ci-robot
Copy link

k8s-ci-robot commented Feb 1, 2021

@payall4u: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

Details

In response to this:

/retest

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
Copy link
Member

estesp commented Feb 1, 2021

/ok-to-test

@payall4u payall4u marked this pull request as ready for review February 1, 2021 15:40
@dims
Copy link
Member

dims commented Feb 1, 2021

LGTM

@fuweid fuweid requested a review from AkihiroSuda February 2, 2021 02:32
fuweid
fuweid approved these changes Feb 2, 2021
View reviewed changes
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid merged commit 349f7a5 into containerd:release/1.4 Feb 2, 2021
@fuweid fuweid changed the title [release/1.4] bugfix change flag from RDONLY to RDWR and close the fifo correct [release/1.4] bugfix: change the flag of open log fifo to avoid containerd hang on syscall open Feb 2, 2021
This was referenced Mar 8, 2021
Closed
Merged
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fuweid fuweid fuweid approved these changes

@AkihiroSuda AkihiroSuda Awaiting requested review from AkihiroSuda

Assignees

No one assigned

Labels

ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@payall4u @k8s-ci-robot @AkihiroSuda @estesp @dims @fuweid