Skip to content
Merged
Changes from all commits
Commits
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: 10 additions & 0 deletions pkg/dmsg/server_session.go
Original file line number Diff line number Diff line change
Expand Up @@ -366,12 +366,22 @@ func (ss *ServerSession) forwardRequest(req StreamRequest) (mStr io.ReadWriteClo
return nil, nil, err
}
}
// Set a deadline for the forwarding handshake. If the destination visor
// accepts the stream but never responds, readObject blocks forever,
// leaking goroutines. Observed as 2K+ stuck goroutines per DMSG server.
if conn, ok := mStr.(net.Conn); ok {
conn.SetDeadline(time.Now().Add(HandshakeTimeout)) //nolint:errcheck,gosec
}
if err = ss.writeObject(mStr, req.raw); err != nil {
return nil, nil, err
}
if respObj, err = ss.readObject(mStr); err != nil {
return nil, nil, err
}
// Clear deadline before returning the stream for long-lived bridging.
if conn, ok := mStr.(net.Conn); ok {
conn.SetDeadline(time.Time{}) //nolint:errcheck,gosec
}
var resp StreamResponse
if resp, err = respObj.ObtainStreamResponse(); err != nil {
return nil, nil, err
Expand Down