opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert io.ErrUnexpectedEOF to a codes.Internal-marked status in toRPCerr. (#2228)

Browse Source 
This is consistent with how io.ErrUnexpectedEOF is handled in a bunch of
other places (e.g. stream.go, server.go), and signals to
application-level code that the error is retryable.
This commit is contained in:
David Symonds
2018-07-19 07:09:07 +10:00
committed by dfawley
parent b534d2d20e
commit 5562178a52
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
go16.go
View File

@ -50,6 +50,9 @@ func toRPCErr(err error) error {
if err == nil || err == io.EOF { if err == nil || err == io.EOF {
return err return err
} }
if err == io.ErrUnexpectedEOF {
return status.Error(codes.Internal, err.Error())
}
if _, ok := status.FromError(err); ok { if _, ok := status.FromError(err); ok {
return err return err
} }

3
go17.go
View File

@ -51,6 +51,9 @@ func toRPCErr(err error) error {
if err == nil || err == io.EOF { if err == nil || err == io.EOF {
return err return err
} }
if err == io.ErrUnexpectedEOF {
return status.Error(codes.Internal, err.Error())
}
if _, ok := status.FromError(err); ok { if _, ok := status.FromError(err); ok {
return err return err
} }

1
rpc_util_test.go
View File

@ -179,6 +179,7 @@ func TestToRPCErr(t *testing.T) {
}{ }{
{transport.StreamError{Code: codes.Unknown, Desc: ""}, status.Error(codes.Unknown, "")}, {transport.StreamError{Code: codes.Unknown, Desc: ""}, status.Error(codes.Unknown, "")},
{transport.ErrConnClosing, status.Error(codes.Unavailable, transport.ErrConnClosing.Desc)}, {transport.ErrConnClosing, status.Error(codes.Unavailable, transport.ErrConnClosing.Desc)},
{io.ErrUnexpectedEOF, status.Error(codes.Internal, io.ErrUnexpectedEOF.Error())},
} { } {
err := toRPCErr(test.errIn) err := toRPCErr(test.errIn)
if _, ok := status.FromError(err); !ok { if _, ok := status.FromError(err); !ok {