make sure console master tty is closed on task exit #11161
+143
−9
Conversation
This file contains 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
henry118
force-pushed
the
ttyleak
branch
2 times, most recently
from
c448293 to
4dd66e1
Compare
henry118
force-pushed
the
ttyleak
branch
3 times, most recently
from
d2728aa to
dfc8bd6
Compare
henry118
changed the title
henry118
force-pushed
the
ttyleak
branch
2 times, most recently
from
dfc8bd6 to
8a238f6
Compare
henry118
changed the title
henry118
force-pushed
the
ttyleak
branch
8 times, most recently
from
ad49a39 to
e593ccd
Compare
henry118
changed the title
fuweid
reviewed
Dec 19, 2024
| @@ -276,6 +276,12 @@ func (p *Init) setExited(status int) { | |||
| p.exited = time.Now() | |||
| p.status = status | |||
| p.Platform.ShutdownConsole(context.Background(), p.console) | |||
| // We need to close the master tty here, in case of stdin, | |||
There was a problem hiding this comment.
I think we can call p.console.Close() during deleting.
containerd/cmd/containerd-shim-runc-v2/process/init.go
Lines 290 to 292 in a5aaa40
Before deleting task, containerd always drains IO first. It's safe to close console in that place.
For the line 283 about calling p.wg.Wait(), I think it's unsafe to do that because SetExited is called by background goroutine triggered by SIGCHILD. When init process exits, its children might hold IO so that p.wg.Wait() will block until all its children exit. Check this issue #10094 for more details.
There was a problem hiding this comment.
Thanks @fuweid. That info really helped! I've made the suggested changes.
Signed-off-by: Henry Wang <[email protected]>
Signed-off-by: Henry Wang <[email protected]>
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.
Fixes: #11160