From 98e0b97072025fd10f1d16c5f39ad8170b094308 Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Mon, 5 Dec 2016 08:47:58 -0800 Subject: [PATCH] fix(tiller): increase the max message size for grpc Increases the default message size from 4MB to 10MB. --- cmd/tiller/tiller.go | 3 +-- pkg/tiller/release_server.go | 12 ++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go index 70672a85d..188eddfec 100644 --- a/cmd/tiller/tiller.go +++ b/cmd/tiller/tiller.go @@ -24,7 +24,6 @@ import ( "os" "github.com/spf13/cobra" - "google.golang.org/grpc" "k8s.io/helm/pkg/proto/hapi/services" "k8s.io/helm/pkg/storage" @@ -41,7 +40,7 @@ const ( // rootServer is the root gRPC server. // // Each gRPC service registers itself to this server during init(). -var rootServer = grpc.NewServer() +var rootServer = tiller.NewServer() // env is the default environment. // diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go index abf8a30ff..2762db3b5 100644 --- a/pkg/tiller/release_server.go +++ b/pkg/tiller/release_server.go @@ -25,6 +25,7 @@ import ( "regexp" "strings" + "google.golang.org/grpc" "google.golang.org/grpc/metadata" "github.com/technosophos/moniker" @@ -81,6 +82,17 @@ var ListDefaultLimit int64 = 512 // prevents an empty string from matching. var ValidName = regexp.MustCompile("^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])+$") +// maxMsgSize use 10MB as the default message size limit. +// grpc library default is 4MB +var maxMsgSize = 1024 * 1024 * 10 + +// NewServer creates a new grpc server. +func NewServer() *grpc.Server { + return grpc.NewServer( + grpc.MaxMsgSize(maxMsgSize), + ) +} + // ReleaseServer implements the server-side gRPC endpoint for the HAPI services. type ReleaseServer struct { env *environment.Environment