Skip to content
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

Jump to bottom

lxd: Consume exec websocket pings for stderr (from Incus) #14477

Merged
merged 1 commit into from
Nov 18, 2024
Merged

lxd: Consume exec websocket pings for stderr (from Incus) #14477

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
9 changes: 9 additions & 0 deletions lxd/instance_exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,15 @@ func (s *execWs) Do(op *operations.Operation) error {
}()
}

if i == execWSStderr {
// Consume data (e.g. websocket pings) from stderr too to
// avoid a situation where we hit an inactivity timeout on
// stderr during long exec sessions
go func() {
_, _, _ = conn.ReadMessage()
}()
}

if i == execWSStdin {
err = <-ws.MirrorWrite(conn, ttys[i])
_ = ttys[i].Close()
Expand Down
Loading