Skip to content

feat: add configurable gRPC message size limits #3214

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

Draft
rrossi-sc wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: add configurable gRPC message size limits #3214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 20 additions & 9 deletions pkg/cmd/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,17 @@ import (
const BufferedNetwork string = "buffnet"

type GRPCServerConfig struct {
Address string `debugmap:"visible"`
Network string `debugmap:"visible" default:"tcp"`
TLSCertPath string `debugmap:"visible"`
TLSKeyPath string `debugmap:"visible"`
MaxConnAge time.Duration `debugmap:"visible" default:"30s"`
Enabled bool `debugmap:"visible"`
BufferSize int `debugmap:"visible"`
ClientCAPath string `debugmap:"visible"`
MaxWorkers uint32 `debugmap:"visible"`
Address string `debugmap:"visible"`
Network string `debugmap:"visible" default:"tcp"`
TLSCertPath string `debugmap:"visible"`
TLSKeyPath string `debugmap:"visible"`
MaxConnAge time.Duration `debugmap:"visible" default:"30s"`
Enabled bool `debugmap:"visible"`
BufferSize int `debugmap:"visible"`
ClientCAPath string `debugmap:"visible"`
MaxWorkers uint32 `debugmap:"visible"`
MaxRecvMsgSize int `debugmap:"visible" default:"4194304"`
MaxSendMsgSize int `debugmap:"visible" default:"4194304"`

flagPrefix string
}
Expand All @@ -64,6 +66,8 @@ func RegisterGRPCServerFlags(flags *pflag.FlagSet, config *GRPCServerConfig, fla
flags.DurationVar(&config.MaxConnAge, flagPrefix+"-max-conn-age", 30*time.Second, "how long a connection serving "+serviceName+" should be able to live")
flags.BoolVar(&config.Enabled, flagPrefix+"-enabled", defaultEnabled, "enable "+serviceName+" gRPC server")
flags.Uint32Var(&config.MaxWorkers, flagPrefix+"-max-workers", 0, "set the number of workers for this server (0 value means 1 worker per request)")
flags.IntVar(&config.MaxRecvMsgSize, flagPrefix+"-max-recv-msg-size", 4*1024*1024, "maximum size in bytes of gRPC messages the server can receive")
flags.IntVar(&config.MaxSendMsgSize, flagPrefix+"-max-send-msg-size", 4*1024*1024, "maximum size in bytes of gRPC messages the server can send")
}

// Complete takes a set of default options and returns a completed server
Expand All @@ -78,6 +82,13 @@ func (c *GRPCServerConfig) Complete(level zerolog.Level, svcRegistrationFn func(
MaxConnectionAge: c.MaxConnAge,
}), grpc.NumStreamWorkers(c.MaxWorkers))

if c.MaxRecvMsgSize > 0 {
opts = append(opts, grpc.MaxRecvMsgSize(c.MaxRecvMsgSize))
}
if c.MaxSendMsgSize > 0 {
opts = append(opts, grpc.MaxSendMsgSize(c.MaxSendMsgSize))
}

tlsOpts, certWatcher, err := c.tlsOpts()
if err != nil {
return nil, err
Expand Down
18 changes: 18 additions & 0 deletions pkg/cmd/util/zz_generated.options.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading