From e63150ef70d2297d55257c70a0aa339fd2fb2024 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (VMware)" Date: Tue, 29 Jan 2019 14:01:23 +0000 Subject: [PATCH] Add max_idle_conns_* to gateway compose file - adds max_idle_conns_* default values to docker-compose.yml to make it easier to override as a user doing testing/tuning - make Golang durations easier to read 300s -> 5m Signed-off-by: Alex Ellis (VMware) --- docker-compose.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2847ff11..28aa0e31 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,17 +8,19 @@ services: - functions environment: functions_provider_url: "http://faas-swarm:8080/" - read_timeout: "300s" # Maximum time to read HTTP request - write_timeout: "300s" # Maximum time to write HTTP response - upstream_timeout: "300s" # Maximum duration of upstream function call - should be more than read_timeout and write_timeout - dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD + read_timeout: "5m5s" # Maximum time to read HTTP request + write_timeout: "5m5s" # Maximum time to write HTTP response + upstream_timeout: "5m" # Maximum duration of upstream function call - should be more than read_timeout and write_timeout + dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD faas_nats_address: "nats" faas_nats_port: 4222 - direct_functions: "true" # Functions are invoked directly over the overlay network + direct_functions: "true" # Functions are invoked directly over the overlay network direct_functions_suffix: "" basic_auth: "${BASIC_AUTH:-true}" secret_mount_path: "/run/secrets/" - scale_from_zero: "true" + scale_from_zero: "true" # Enable if you want functions to scale from 0/0 to min replica count upon invoke + max_idle_conns: 1024 + max_idle_conns_per_host: 1024 deploy: resources: # limits: # Enable if you want to limit memory usage @@ -45,8 +47,8 @@ services: networks: - functions environment: - read_timeout: "300s" # set both here, and on your functions - write_timeout: "300s" # set both here, and on your functions + read_timeout: "5m5s" # set both here, and on your functions + write_timeout: "5m5s" # set both here, and on your functions DOCKER_API_VERSION: "1.30" basic_auth: "${BASIC_AUTH:-true}" secret_mount_path: "/run/secrets/" @@ -95,7 +97,7 @@ services: - functions environment: max_inflight: "1" - ack_wait: "300s" # Max duration of any async task / request + ack_wait: "5m5s" # Max duration of any async task / request basic_auth: "${BASIC_AUTH:-true}" secret_mount_path: "/run/secrets/" deploy: