From 9b3795fd3adec27bbc5eff2d3237ccdb1d14f281 Mon Sep 17 00:00:00 2001
From: Dominic Kim <style95@apache.org>
Date: Tue, 2 Aug 2022 13:19:42 +0900
Subject: [PATCH 1/2] Adjust the default configurations.

---
 ansible/group_vars/all                           | 12 ++++++------
 ansible/roles/schedulers/tasks/deploy.yml        |  4 ++++
 core/invoker/src/main/resources/application.conf |  7 +++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index f444dcd931d..cacdc7cc7d6 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -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) }}"
 
@@ -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') }}"
diff --git a/ansible/roles/schedulers/tasks/deploy.yml b/ansible/roles/schedulers/tasks/deploy.yml
index 82f82d4c1b0..72895acab55 100644
--- a/ansible/roles/schedulers/tasks/deploy.yml
+++ b/ansible/roles/schedulers/tasks/deploy.yml
@@ -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() }}"
diff --git a/core/invoker/src/main/resources/application.conf b/core/invoker/src/main/resources/application.conf
index 1624beb49d8..c0b22b6e8b7 100644
--- a/core/invoker/src/main/resources/application.conf
+++ b/core/invoker/src/main/resources/application.conf
@@ -180,6 +180,13 @@ whisk {
     username: "invoker.user"
     password: "invoker.pass"
     protocol: http
+
+    resource {
+      tags: ""
+    }
+    dedicated {
+      namespaces: ""
+    }
   }
   runtime.delete.timeout = "30 seconds"
 }

From 7094e85e0c99924382a239ec78710a13ed0cc5aa Mon Sep 17 00:00:00 2001
From: Dominic Kim <style95@apache.org>
Date: Wed, 3 Aug 2022 09:38:07 +0900
Subject: [PATCH 2/2] Change the default etcd retention to string.

---
 ansible/group_vars/all | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index cacdc7cc7d6..bac6e237280 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -468,7 +468,7 @@ etcd:
   loglevel: "{{ etcd_log_level | default('info') }}"
   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_retention: "{{ etcd_auto_compaction_retention | default('10m') }}"
   auto_compaction_mode: "{{ etcd_auto_compaction_mode | default('periodic') }}"
   pool_threads: "{{ etcd_pool_threads | default(10) }}"