Skip to content

Commit

Permalink
Adjust the default configurations. (#5302)
Browse files Browse the repository at this point in the history
* Adjust the default configurations.

* Change the default etcd retention to string.
  • Loading branch information
style95 authored Aug 3, 2022
1 parent 2683ed1 commit cf127f9
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
12 changes: 6 additions & 6 deletions ansible/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -464,11 +464,11 @@ etcd:
dir:
data: "{{ etcd_data_dir | default('') }}"
lease:
timeout: "{{ etcd_lease_timeout | default(1) }}"
timeout: "{{ etcd_lease_timeout | default(10) }}"
loglevel: "{{ etcd_log_level | default('info') }}"
quota_backend_bytes: "{{ etcd_quota_backend_bytes | default(0) }}"
snapshot_count: "{{ etcd_snapshot_count | default(100000) }}"
auto_compaction_retention: "{{ etcd_auto_compaction_retention | default(1) }}"
quota_backend_bytes: "{{ etcd_quota_backend_bytes | default(2147483648) }}" # 2GB
snapshot_count: "{{ etcd_snapshot_count | default(10000) }}"
auto_compaction_retention: "{{ etcd_auto_compaction_retention | default('10m') }}"
auto_compaction_mode: "{{ etcd_auto_compaction_mode | default('periodic') }}"
pool_threads: "{{ etcd_pool_threads | default(10) }}"

Expand Down Expand Up @@ -530,9 +530,9 @@ scheduler:
maxRetriesToGetQueue: "{{ scheduler_maxRetriesToGetQueue | default(13) }}"
queue:
# the queue's state Running timeout, e.g. if have no activation comes into queue when Running, the queue state will be changed from Running to Idle and delete the decision algorithm actor
idleGrace: "{{ scheduler_queue_idleGrace | default('20 seconds') }}"
idleGrace: "{{ scheduler_queue_idleGrace | default('10 minutes') }}"
# the queue's state Idle timeout, e.g. if have no activation comes into queue when Idle, the queue state will be changed from Idle to Removed
stopGrace: "{{ scheduler_queue_stopGrace | default('20 seconds') }}"
stopGrace: "{{ scheduler_queue_stopGrace | default('10 minutes') }}"
# the queue's state Paused timeout, e.g. if have no activation comes into queue when Paused, the queue state will be changed from Paused to Removed
flushGrace: "{{ scheduler_queue_flushGrace | default('60 seconds') }}"
gracefulShutdownTimeout: "{{ scheduler_queue_gracefulShutdownTimeout | default('5 seconds') }}"
Expand Down
4 changes: 4 additions & 0 deletions ansible/roles/schedulers/tasks/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@
"CONFIG_whisk_timeLimit_max": "{{ limit_action_time_max | default() }}"
"CONFIG_whisk_timeLimit_std": "{{ limit_action_time_std | default() }}"

"CONFIG_whisk_concurrencyLimit_min": "{{ limit_action_concurrency_min | default() }}"
"CONFIG_whisk_concurrencyLimit_max": "{{ limit_action_concurrency_max | default() }}"
"CONFIG_whisk_concurrencyLimit_std": "{{ limit_action_concurrency_std | default() }}"

"RUNTIMES_MANIFEST": "{{ runtimesManifest | to_json }}"
"CONFIG_whisk_runtimes_defaultImagePrefix":
"{{ runtimes_default_image_prefix | default() }}"
Expand Down
7 changes: 7 additions & 0 deletions core/invoker/src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,13 @@ whisk {
username: "invoker.user"
password: "invoker.pass"
protocol: http

resource {
tags: ""
}
dedicated {
namespaces: ""
}
}
runtime.delete.timeout = "30 seconds"
}

0 comments on commit cf127f9

Please sign in to comment.