Fix typo on ack_wait

Signed-off-by: Alex Ellis (VMware) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (VMware)
2018-05-28 15:21:42 -07:00
parent ab2aa14c48
commit 3ee7c99701
2 changed files with 19 additions and 10 deletions

View File

@ -3,20 +3,20 @@ services:
gateway: gateway:
ports: ports:
- 8080:8080 - 8080:8080
image: functions/gateway:0.8.1 image: functions/gateway:0.8.2
networks: networks:
- functions - functions
environment: environment:
functions_provider_url: "http://faas-swarm:8080/" functions_provider_url: "http://faas-swarm:8080/"
read_timeout: "25s" # Maximum time to read HTTP request read_timeout: "300s" # Maximum time to read HTTP request
write_timeout: "25s" # Maximum time to write HTTP response write_timeout: "300s" # Maximum time to write HTTP response
upstream_timeout: "20s" # Maximum duration of upstream function call - should be more than read_timeout and write_timeout 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 dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD
faas_nats_address: "nats" faas_nats_address: "nats"
faas_nats_port: 4222 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: "" direct_functions_suffix: ""
basic_auth: "false" basic_auth: "true"
secret_mount_path: "/run/secrets/" secret_mount_path: "/run/secrets/"
deploy: deploy:
resources: resources:
@ -32,6 +32,9 @@ services:
placement: placement:
constraints: constraints:
- 'node.platform.os == linux' - 'node.platform.os == linux'
secrets:
- basic-auth-user
- basic-auth-password
# Docker Swarm provider # Docker Swarm provider
faas-swarm: faas-swarm:
@ -43,8 +46,8 @@ services:
networks: networks:
- functions - functions
environment: environment:
read_timeout: "25s" # set both here, and on your functions read_timeout: "300s" # set both here, and on your functions
write_timeout: "25s" # set both here, and on your functions write_timeout: "300s" # set both here, and on your functions
DOCKER_API_VERSION: "1.30" DOCKER_API_VERSION: "1.30"
deploy: deploy:
placement: placement:
@ -88,7 +91,7 @@ services:
- functions - functions
environment: environment:
max_inflight: "1" max_inflight: "1"
ack_timeout: "30s" # Max duration of any async task / request ack_wait: "300s" # Max duration of any async task / request
deploy: deploy:
resources: resources:
limits: limits:
@ -274,3 +277,9 @@ networks:
attachable: true attachable: true
labels: labels:
- "openfaas=true" - "openfaas=true"
secrets:
basic-auth-user:
external: true
basic-auth-password:
external: true

View File

@ -67,9 +67,9 @@ write_timeout: 25s
### Timeouts - Asynchronous invocations ### Timeouts - Asynchronous invocations
For asynchronous invocations of functions a separate timeout can be configured at the `queue-worker` level in the `ack_timeout` environmental variable. For asynchronous invocations of functions a separate timeout can be configured at the `queue-worker` level in the `ack_wait` environmental variable.
If the `ack_timeout` is exceeded the task will not be acknowledge and the queue system will retry the invocation. If the `ack_wait` is exceeded the task will not be acknowledge and the queue system will retry the invocation.
## Function execution logs ## Function execution logs