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

rpc_util: Change error message to indicate size after decompression #4918

Merged
merged 4 commits into from
Nov 11, 2021
Merged

rpc_util: Change error message to indicate size after decompression #4918

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d80a732
rpc_util: Change error message to indicate size after decompression
uds5501 Nov 1, 2021
ed2a57a
Merge branch 'master' into fix-4761
uds5501 Nov 3, 2021
bedb598
rpc_util: Remove double checks for non compressed messages and change…
uds5501 Nov 5, 2021
367ee67
rpc_util: Fix vet errors
uds5501 Nov 11, 2021
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: 5 additions & 5 deletions rpc_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,14 +712,14 @@ func recvAndDecompress(p *parser, s *transport.Stream, dc Decompressor, maxRecei
if err != nil {
return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err)
}
if size > maxReceiveMessageSize {
// TODO: Revisit the error code. Currently keep it consistent with java
// implementation.
return nil, status.Errorf(codes.ResourceExhausted, "grpc: received message after decompression larger than max (%d vs. %d)", size, maxReceiveMessageSize)
}
} else {
size = len(d)
}
if size > maxReceiveMessageSize {
// TODO: Revisit the error code. Currently keep it consistent with java
// implementation.
return nil, status.Errorf(codes.ResourceExhausted, "grpc: received message larger than max (%d vs. %d)", size, maxReceiveMessageSize)
}
return d, nil
}

Expand Down