Skip to content

Commit 6e8cf08

Browse files
style95michele-sciabarra
authored andcommitted
Adjust the default configurations. (apache#5302)
* Adjust the default configurations. * Change the default etcd retention to string.
1 parent 0a397e1 commit 6e8cf08

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

ansible/group_vars/all

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -464,11 +464,11 @@ etcd:
464464
dir:
465465
data: "{{ etcd_data_dir | default('') }}"
466466
lease:
467-
timeout: "{{ etcd_lease_timeout | default(1) }}"
467+
timeout: "{{ etcd_lease_timeout | default(10) }}"
468468
loglevel: "{{ etcd_log_level | default('info') }}"
469-
quota_backend_bytes: "{{ etcd_quota_backend_bytes | default(0) }}"
470-
snapshot_count: "{{ etcd_snapshot_count | default(100000) }}"
471-
auto_compaction_retention: "{{ etcd_auto_compaction_retention | default(1) }}"
469+
quota_backend_bytes: "{{ etcd_quota_backend_bytes | default(2147483648) }}" # 2GB
470+
snapshot_count: "{{ etcd_snapshot_count | default(10000) }}"
471+
auto_compaction_retention: "{{ etcd_auto_compaction_retention | default('10m') }}"
472472
auto_compaction_mode: "{{ etcd_auto_compaction_mode | default('periodic') }}"
473473
pool_threads: "{{ etcd_pool_threads | default(10) }}"
474474

@@ -530,9 +530,9 @@ scheduler:
530530
maxRetriesToGetQueue: "{{ scheduler_maxRetriesToGetQueue | default(13) }}"
531531
queue:
532532
# 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
533-
idleGrace: "{{ scheduler_queue_idleGrace | default('20 seconds') }}"
533+
idleGrace: "{{ scheduler_queue_idleGrace | default('10 minutes') }}"
534534
# 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
535-
stopGrace: "{{ scheduler_queue_stopGrace | default('20 seconds') }}"
535+
stopGrace: "{{ scheduler_queue_stopGrace | default('10 minutes') }}"
536536
# 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
537537
flushGrace: "{{ scheduler_queue_flushGrace | default('60 seconds') }}"
538538
gracefulShutdownTimeout: "{{ scheduler_queue_gracefulShutdownTimeout | default('5 seconds') }}"

ansible/roles/schedulers/tasks/deploy.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,10 @@
187187
"CONFIG_whisk_timeLimit_max": "{{ limit_action_time_max | default() }}"
188188
"CONFIG_whisk_timeLimit_std": "{{ limit_action_time_std | default() }}"
189189

190+
"CONFIG_whisk_concurrencyLimit_min": "{{ limit_action_concurrency_min | default() }}"
191+
"CONFIG_whisk_concurrencyLimit_max": "{{ limit_action_concurrency_max | default() }}"
192+
"CONFIG_whisk_concurrencyLimit_std": "{{ limit_action_concurrency_std | default() }}"
193+
190194
"RUNTIMES_MANIFEST": "{{ runtimesManifest | to_json }}"
191195
"CONFIG_whisk_runtimes_defaultImagePrefix":
192196
"{{ runtimes_default_image_prefix | default() }}"

core/invoker/src/main/resources/application.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,13 @@ whisk {
180180
username: "invoker.user"
181181
password: "invoker.pass"
182182
protocol: http
183+
184+
resource {
185+
tags: ""
186+
}
187+
dedicated {
188+
namespaces: ""
189+
}
183190
}
184191
runtime.delete.timeout = "30 seconds"
185192
}

0 commit comments

Comments
 (0)