Skip to content

Fix hang on shutdown #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmcgowan merged 1 commit into from
Nov 21, 2025
+6 −4
Merged

Fix hang on shutdown #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions internal/vminit/runc/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console
}
if cstdin != nil {
cons = &closingConsole{
Console: epollConsole,
closeStdin: cstdin,
EpollConsole: epollConsole,
closeStdin: cstdin,
}
} else {
cons = epollConsole
Expand All @@ -237,7 +237,9 @@ func (p *linuxPlatform) ShutdownConsole(ctx context.Context, cons console.Consol
if p.epoller == nil {
return errors.New("uninitialized epoller")
}
epollConsole, ok := cons.(*console.EpollConsole)
epollConsole, ok := cons.(interface {
Shutdown(close func(int) error) error
})
if !ok {
return fmt.Errorf("expected EpollConsole, got %#v", cons)
}
Expand All @@ -249,7 +251,7 @@ func (p *linuxPlatform) Close() error {
}

type closingConsole struct {
console.Console
*console.EpollConsole

closeStdin io.Closer
}
Expand Down
Loading