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

fix max msg size type issues on different arch (#1623)

Browse Source
This commit is contained in:
lyuxuan
2017-10-26 13:30:15 -07:00
committed by GitHub
parent 3cc21586ac
commit fe0602d9d8
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rpc_util.go
View File

@ -274,7 +274,10 @@ func (p *parser) recvMsg(maxReceiveMessageSize int) (pf payloadFormat, msg []byt
if length == 0 { if length == 0 {
return pf, nil, nil return pf, nil, nil
} }
if length > uint32(maxReceiveMessageSize) { if int64(length) > int64(maxInt) {
return 0, nil, Errorf(codes.ResourceExhausted, "grpc: received message larger than max length allowed on current machine (%d vs. %d)", length, maxInt)
}
if int(length) > maxReceiveMessageSize {
return 0, nil, Errorf(codes.ResourceExhausted, "grpc: received message larger than max (%d vs. %d)", length, maxReceiveMessageSize) return 0, nil, Errorf(codes.ResourceExhausted, "grpc: received message larger than max (%d vs. %d)", length, maxReceiveMessageSize)
} }
// TODO(bradfitz,zhaoq): garbage. reuse buffer after proto decoding instead // TODO(bradfitz,zhaoq): garbage. reuse buffer after proto decoding instead

22
service_config.go
View File

@ -25,6 +25,8 @@ import (
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
) )
const maxInt = int(^uint(0) >> 1)
// MethodConfig defines the configuration recommended by the service providers for a // MethodConfig defines the configuration recommended by the service providers for a
// particular method. // particular method.
// DEPRECATED: Users should not use this struct. Service config should be received // DEPRECATED: Users should not use this struct. Service config should be received
@ -97,8 +99,8 @@ type jsonMC struct {
Name *[]jsonName Name *[]jsonName
WaitForReady *bool WaitForReady *bool
Timeout *string Timeout *string
MaxRequestMessageBytes *int MaxRequestMessageBytes *int64
MaxResponseMessageBytes *int MaxResponseMessageBytes *int64
} }
// TODO(lyuxuan): delete this struct after cleaning up old service config implementation. // TODO(lyuxuan): delete this struct after cleaning up old service config implementation.
@ -135,8 +137,20 @@ func parseServiceConfig(js string) (ServiceConfig, error) {
mc := MethodConfig{ mc := MethodConfig{
WaitForReady: m.WaitForReady, WaitForReady: m.WaitForReady,
Timeout: d, Timeout: d,
MaxReqSize: m.MaxRequestMessageBytes, }
MaxRespSize: m.MaxResponseMessageBytes, if m.MaxRequestMessageBytes != nil {
if *m.MaxRequestMessageBytes > int64(maxInt) {
mc.MaxReqSize = newInt(maxInt)
} else {
mc.MaxReqSize = newInt(int(*m.MaxRequestMessageBytes))
}
}
if m.MaxResponseMessageBytes != nil {
if *m.MaxResponseMessageBytes > int64(maxInt) {
mc.MaxRespSize = newInt(maxInt)
} else {
mc.MaxRespSize = newInt(int(*m.MaxResponseMessageBytes))
}
} }
for _, n := range *m.Name { for _, n := range *m.Name {
if path, valid := n.generatePath(); valid { if path, valid := n.generatePath(); valid {