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: return better status for context err when writing header #5292

Merged
merged 6 commits into from Apr 8, 2022
Merged

server: return better status for context err when writing header #5292

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1715f7e
Handle ctx err in writeheader
idiamond-stripe Apr 4, 2022
6f33edb
handle ContextErr inside WriteHeader
idiamond-stripe Apr 6, 2022
e38bde5
always return status.Error from WriteHeader
idiamond-stripe Apr 6, 2022
732ffc9
respond to review feedback
idiamond-stripe Apr 7, 2022
f739f9e
replace internal error with convert
idiamond-stripe Apr 7, 2022
32d8958
move s.cancel and remove TODO
idiamond-stripe Apr 7, 2022
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
3 changes: 3 additions & 0 deletions internal/transport/http2_server.go
View file
Open in desktop
Expand Up @@ -1065,6 +1065,9 @@ func (t *http2Server) Write(s *Stream, hdr []byte, data []byte, opts *Options) e
if _, ok := err.(ConnectionError); ok {
return err
}
if s.ctx.Err() != nil {
dfawley marked this conversation as resolved.
Show resolved Hide resolved
return ContextErr(s.ctx.Err())
}
// TODO(mmukhi, dfawley): Make sure this is the right code to return.
return status.Errorf(codes.Internal, "transport: %v", err)
}
Expand Down
4 changes: 2 additions & 2 deletions test/end2end_test.go
View file
Open in desktop
Expand Up @@ -4964,8 +4964,8 @@ func testClientSendDataAfterCloseSend(t *testing.T, e env) {
}
if err := stream.SendMsg(nil); err == nil {
t.Error("expected error sending message on stream after stream closed due to illegal data")
} else if status.Code(err) != codes.Internal {
t.Errorf("expected internal error, instead received '%v'", err)
} else if status.Code(err) != codes.Canceled {
t.Errorf("expected cancel error, instead received '%v'", err)
}
return nil
}}
Expand Down