never send procError after the socket closed#4173
Merged
Merged
Conversation
Member
|
@lifubang can we add an integration test for this? So the next refactor doesn't regress on this. |
7a237e2 to
8071b9a
Compare
Member
Author
Good idea, added two tests. Thanks. |
8071b9a to
1f6f980
Compare
cyphar
requested changes
Jan 21, 2024
cyphar
reviewed
Jan 21, 2024
1f6f980 to
7730c81
Compare
417ca41 to
1c3b067
Compare
cyphar
reviewed
Jan 23, 2024
Member
cyphar
left a comment
There was a problem hiding this comment.
I think atomic.Bool is nicer for this than using mutexes, but I don't have a strong opinion.
kolyshkin
reviewed
Jan 23, 2024
kolyshkin
reviewed
Jan 23, 2024
e92ac5d to
79f3d6a
Compare
kolyshkin
reviewed
Jan 25, 2024
Signed-off-by: lifubang <lifubang@acmcoder.com>
Signed-off-by: lfbzhm <lifubang@acmcoder.com>
79f3d6a to
0bc4732
Compare
AkihiroSuda
approved these changes
Jan 27, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We have moved the error msg display position in #3385, I think it's reasonable to display the container init msg in one place, but in this PR, we changed an error ignore behavior in https://github.com/opencontainers/runc/blob/main/libcontainer/init_linux.go#L112-L113 .
Yes, we should display the error before
procReadyhas sent, but we should ignore after that. So I think we can add a field to indicate whether we have sentprocReadyor not in child process. It's not needed for the parent process, but we can reuse it to remove a local varseenProcReady.Fix #4171