Merge pull request #8437 from fanminshi/no_outbound_limit_size

v3rpc: use MaxRecvMsgSize and MaxSendMsgSize to limit msg size
etcd-io · Aug 24, 2017 · 4ec31f4 · 4ec31f4
2 parents 752c161 + d2ca782
commit 4ec31f4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/etcdserver/api/v3rpc/grpc.go b/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...)