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

server: prevent hang in Go HTTP transport in some error cases #3833

Merged
merged 2 commits into from Aug 22, 2020
Merged

server: prevent hang in Go HTTP transport in some error cases #3833

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bcacdb
Return codes.Unknown with unknown error status
GarrettGutierrez1 Aug 21, 2020
9ca729f
Using status.Convert
GarrettGutierrez1 Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions server.go
View file
Open in desktop
Expand Up @@ -1156,10 +1156,9 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
}
d, err := recvAndDecompress(&parser{r: stream}, stream, dc, s.opts.maxReceiveMessageSize, payInfo, decomp)
if err != nil {
if st, ok := status.FromError(err); ok {
if e := t.WriteStatus(stream, st); e != nil {
channelz.Warningf(logger, s.channelzID, "grpc: Server.processUnaryRPC failed to write status %v", e)
}
st, _ := status.FromError(err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use toRPCErr instead for this conversion.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh no.. maybe not. That doesn't guarantee a status is returned. It can return io.EOF. It is nicer than status.FromError in that it handles other types of errors, though.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, this is good enough, then, since we don't expect it to not be a status in most cases. But please use status.Convert instead and remove the st variable.

if e := t.WriteStatus(stream, st); e != nil {
channelz.Warningf(logger, s.channelzID, "grpc: Server.processUnaryRPC failed to write status %v", e)
}
return err
}
Expand Down