Browse Source

Merge pull request #8437 from fanminshi/no_outbound_limit_size

v3rpc: use MaxRecvMsgSize and MaxSendMsgSize to limit msg size
fanmin shi 8 years ago
parent
commit
4ec31f4f7f
1 changed files with 3 additions and 1 deletions
  1. 3 1
      etcdserver/api/v3rpc/grpc.go

+ 3 - 1
etcdserver/api/v3rpc/grpc.go

@@ -31,6 +31,7 @@ import (
 const (
 	grpcOverheadBytes = 512 * 1024
 	maxStreams        = math.MaxUint32
+	maxSendBytes      = math.MaxInt32
 )
 
 func init() {
@@ -45,7 +46,8 @@ func Server(s *etcdserver.EtcdServer, tls *tls.Config) *grpc.Server {
 	}
 	opts = append(opts, grpc.UnaryInterceptor(newUnaryInterceptor(s)))
 	opts = append(opts, grpc.StreamInterceptor(newStreamInterceptor(s)))
-	opts = append(opts, grpc.MaxMsgSize(int(s.Cfg.MaxRequestBytes+grpcOverheadBytes)))
+	opts = append(opts, grpc.MaxRecvMsgSize(int(s.Cfg.MaxRequestBytes+grpcOverheadBytes)))
+	opts = append(opts, grpc.MaxSendMsgSize(maxSendBytes))
 	opts = append(opts, grpc.MaxConcurrentStreams(maxStreams))
 	grpcServer := grpc.NewServer(opts...)