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

adding dapr-http-read-buffer-size parameter to cli #993

Merged
merged 8 commits into from
Jun 9, 2022
Merged

adding dapr-http-read-buffer-size parameter to cli #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0657b28
Modify path DaprRoot add the SystemDrive environment variable
hueifeng May 31, 2022
8a6c58b
Script for docker install instead of actions-setup-docker (#986)
pravinpushkar May 31, 2022
45877e3
Format output of dapr --version as JSON. (#878)
fanfanbj Jun 1, 2022
116245e
Fix for panic during upgrade of edge version dapr (#983)
pravinpushkar Jun 1, 2022
8f1b889
Add dapr annotate command (#873)
jjcollinge Jun 2, 2022
71a7e6e
Update go version to 1.18 (#982)
pravinpushkar Jun 3, 2022
bba4939
adding dapr-http-read-buffer-size parameter to cli
hueifeng Jun 3, 2022
0c748ab
Merge branch 'master' into dapr-http-read-buffer-size
hueifeng Jun 3, 2022
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
3 changes: 3 additions & 0 deletions cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ var (
appSSL bool
metricsPort int
maxRequestBodySize int
readBufferSize int
unixDomainSocket string
enableAPILogging bool
)
Expand Down Expand Up @@ -115,6 +116,7 @@ dapr run --app-id myapp --app-port 3000 --app-protocol grpc -- go run main.go
AppSSL: appSSL,
MetricsPort: metricsPort,
MaxRequestBodySize: maxRequestBodySize,
HTTPReadBufferSize: readBufferSize,
UnixDomainSocket: unixDomainSocket,
EnableAPILogging: enableAPILogging,
})
Expand Down Expand Up @@ -364,6 +366,7 @@ func init() {
RunCmd.Flags().IntVarP(&metricsPort, "metrics-port", "M", -1, "The port of metrics on dapr")
RunCmd.Flags().BoolP("help", "h", false, "Print this help message")
RunCmd.Flags().IntVarP(&maxRequestBodySize, "dapr-http-max-request-size", "", -1, "Max size of request body in MB")
RunCmd.Flags().IntVarP(&readBufferSize, "dapr-http-read-buffer-size", "", -1, "HTTP header read buffer in KB")
RunCmd.Flags().StringVarP(&unixDomainSocket, "unix-domain-socket", "u", "", "Path to a unix domain socket dir. If specified, Dapr API servers will use Unix Domain Sockets")
RunCmd.Flags().BoolVar(&enableAPILogging, "enable-api-logging", false, "Log API calls at INFO verbosity. Valid values are: true or false")

Expand Down
7 changes: 7 additions & 0 deletions pkg/standalone/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ type runData struct {
appCmd string
enableMetrics bool
maxRequestBodySize int
httpReadBufferSize int
}

func (d *daprProcess) List() ([]ListOutput, error) {
Expand Down Expand Up @@ -134,6 +135,11 @@ func List() ([]ListOutput, error) {
continue
}

httpReadBufferSize, err := strconv.Atoi(argumentsMap["--dapr-http-read-buffer-size"])
if err != nil {
continue
}

run := runData{
cliPID: cliPID,
sidecarPID: proc.Pid(),
Expand All @@ -144,6 +150,7 @@ func List() ([]ListOutput, error) {
appCmd: appCmd,
enableMetrics: enableMetrics,
maxRequestBodySize: maxRequestBodySize,
httpReadBufferSize: httpReadBufferSize,
}

cliToSidecarMap[cliPID] = &run
Expand Down
5 changes: 5 additions & 0 deletions pkg/standalone/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ type RunConfig struct {
AppSSL bool `arg:"app-ssl"`
MetricsPort int `env:"DAPR_METRICS_PORT" arg:"metrics-port"`
MaxRequestBodySize int `arg:"dapr-http-max-request-size"`
HTTPReadBufferSize int `arg:"dapr-http-read-buffer-size"`
UnixDomainSocket string `arg:"unix-domain-socket"`
EnableAPILogging bool `arg:"enable-api-logging"`
}
Expand Down Expand Up @@ -158,6 +159,10 @@ func (config *RunConfig) validate() error {
config.MaxRequestBodySize = -1
}

if config.HTTPReadBufferSize < 0 {
config.HTTPReadBufferSize = -1
}

err = config.validatePlacementHostAddr()
if err != nil {
return err
Expand Down
2 changes: 2 additions & 0 deletions pkg/standalone/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ func assertCommonArgs(t *testing.T, basicConfig *RunConfig, output *RunOutput) {
assertArgumentEqual(t, "app-ssl", "", output.DaprCMD.Args)
assertArgumentEqual(t, "metrics-port", "9001", output.DaprCMD.Args)
assertArgumentEqual(t, "dapr-http-max-request-size", "-1", output.DaprCMD.Args)
assertArgumentEqual(t, "dapr-http-read-buffer-size", "-1", output.DaprCMD.Args)
}

func assertAppEnv(t *testing.T, config *RunConfig, output *RunOutput) {
Expand Down Expand Up @@ -148,6 +149,7 @@ func TestRun(t *testing.T) {
AppSSL: true,
MetricsPort: 9001,
MaxRequestBodySize: -1,
HTTPReadBufferSize: -1,
EnableAPILogging: true,
}

Expand Down