Make proxy timeouts configurable. (#5272)

apache · Jul 12, 2022 · a7fecfb · a7fecfb
1 parent 2363295
commit a7fecfb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
@@ -52,6 +52,11 @@ whisk:
  require_api_key_annotation: "{{ require_api_key_annotation | default(true) | lower }}"
  require_response_payload: "{{ require_response_payload | default(true) | lower }}"
  cluster_name: "{{ whisk_cluster_name | default('whisk') }}"
+ containerProxy:
+ timeouts:
+ idleContainer: "{{ containerProxy_timeouts_idleContainer | default('10 minutes') }}"
+ pauseGrace: "{{ containerProxy_timeouts_pauseGrace | default('10 seconds') }}"
+ keepingDuration: "{{ containerProxy_timeouts_keepingDuration | default('10 minutes') }}"
 
 ##
 # configuration parameters related to support runtimes (see org.apache.openwhisk.core.entity.ExecManifest for schema of the manifest).

diff --git a/ansible/roles/invoker/tasks/deploy.yml b/ansible/roles/invoker/tasks/deploy.yml
@@ -282,6 +282,9 @@
  "CONFIG_whisk_invoker_https_keystorePassword": "{{ invoker.ssl.keystore.password }}"
  "CONFIG_whisk_invoker_https_keystoreFlavor": "{{ invoker.ssl.storeFlavor }}"
  "CONFIG_whisk_invoker_https_clientAuth": "{{ invoker.ssl.clientAuth }}"
+ "CONFIG_whisk_containerProxy_timeouts_idleContainer": "{{ whisk.containerProxy.timeouts.idleContainer }}"
+ "CONFIG_whisk_containerProxy_timeouts_pauseGrace": "{{ whisk.containerProxy.timeouts.pauseGrace }}"
+ "CONFIG_whisk_containerProxy_timeouts_keepingDuration": "{{ whisk.containerProxy.timeouts.keepingDuration }}"
  "CONFIG_whisk_containerPool_prewarmExpirationCheckInitDelay": "{{ container_pool_prewarm_expirationCheckInitDelay | default('10 minutes') }}"
  "CONFIG_whisk_containerPool_prewarmExpirationCheckInterval": "{{ container_pool_prewarm_expirationCheckInterval | default('10 minutes') }}"
  "CONFIG_whisk_containerPool_prewarmExpirationCheckIntervalVariance": "{{ container_pool_prewarm_expirationCheckIntervalVariance | default('10 seconds') }}"

diff --git a/core/invoker/src/main/resources/application.conf b/core/invoker/src/main/resources/application.conf
@@ -156,7 +156,7 @@ whisk {
  #aka 'How long should a container sit idle until we kill it?'
  idle-container = 10 minutes
  pause-grace = 50 milliseconds
- keeping-duration = 1 second
+ keeping-duration = 10 minutes
  }
  action-health-check {
  enabled = false # if true, prewarm containers will be pinged periodically and warm containers will be pinged once after resumed