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

ticlient: set max send/recv msg size match tikv's config (#10706) #10710

Merged
merged 3 commits into from
Jun 6, 2019
Merged

ticlient: set max send/recv msg size match tikv's config (#10706) #10710

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c76a2ca
ticlient: set max send/recv msg size match tikv's config (#10706)
lysu Jun 5, 2019
9ea239d
Merge branch 'release-2.1' into cp-grpc-max-21
zz-jason Jun 5, 2019
150d6ef
Merge branch 'release-2.1' into cp-grpc-max-21
ngaut Jun 5, 2019
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
9 changes: 5 additions & 4 deletions store/tikv/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package tikv

import (
"io"
"math"
"strconv"
"sync"
"sync/atomic"
Expand Down Expand Up @@ -53,11 +54,11 @@ var GrpcKeepAliveTimeout = time.Duration(3) * time.Second

// MaxSendMsgSize set max gRPC request message size sent to server. If any request message size is larger than
// current value, an error will be reported from gRPC.
var MaxSendMsgSize = 1<<31 - 1
var MaxSendMsgSize = 10 * 1024 * 1024

// MaxCallMsgSize set max gRPC receive message size received from server. If any message size is larger than
// MaxRecvMsgSize set max gRPC receive message size received from server. If any message size is larger than
// current value, an error will be reported from gRPC.
var MaxCallMsgSize = 1<<31 - 1
var MaxRecvMsgSize = math.MaxInt64

// Timeout durations.
const (
Expand Down Expand Up @@ -134,7 +135,7 @@ func (a *connArray) Init(addr string, security config.Security) error {
grpc.WithInitialConnWindowSize(grpcInitialConnWindowSize),
grpc.WithUnaryInterceptor(unaryInterceptor),
grpc.WithStreamInterceptor(streamInterceptor),
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(MaxCallMsgSize)),
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(MaxRecvMsgSize)),
grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(MaxSendMsgSize)),
grpc.WithBackoffMaxDelay(time.Second*3),
grpc.WithKeepaliveParams(keepalive.ClientParameters{
Expand Down