From b9963c15dac68e93b0d793333da4681a22c3dffb Mon Sep 17 00:00:00 2001 From: Krystian Panek Date: Wed, 29 Nov 2023 14:46:45 +0100 Subject: [PATCH] More optimized defaults --- README.md | 2 +- examples/docker/src/aem/default/etc/aem.yml | 4 ++-- pkg/cfg/defaults.go | 4 ++-- pkg/project/app_classic/aem/default/etc/aem.yml | 4 ++-- pkg/project/app_cloud/aem/default/etc/aem.yml | 5 +++-- pkg/project/instance/aem/default/etc/aem.yml | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 9b20bc79..11a239ff 100644 --- a/README.md +++ b/README.md @@ -295,7 +295,7 @@ instance: # Time to wait for next state checking interval: 6s # Number of successful check attempts that indicates end of checking - done_threshold: 5 + done_threshold: 4 # Max time to wait for the instance to be healthy after executing the start script or e.g deploying a package await_started: timeout: 30m diff --git a/examples/docker/src/aem/default/etc/aem.yml b/examples/docker/src/aem/default/etc/aem.yml index 9aa08a58..245e8fb0 100755 --- a/examples/docker/src/aem/default/etc/aem.yml +++ b/examples/docker/src/aem/default/etc/aem.yml @@ -63,7 +63,7 @@ instance: # Time to wait for next state checking interval: 6s # Number of successful check attempts that indicates end of checking - done_threshold: 5 + done_threshold: 4 # Max time to wait for the instance to be healthy after executing the start script or e.g deploying a package await_started: timeout: 30m @@ -96,7 +96,7 @@ instance: component_stable: skip: false pids_ignored: [] - pids_failed_activation: ["*"] + pids_failed_activation: [] pids_unsatisfied_reference: [] # Sling Installer tracking installer: diff --git a/pkg/cfg/defaults.go b/pkg/cfg/defaults.go index 5505cf21..fdd7a501 100644 --- a/pkg/cfg/defaults.go +++ b/pkg/cfg/defaults.go @@ -45,7 +45,7 @@ func (c *Config) setDefaults() { v.SetDefault("instance.check.skip", false) v.SetDefault("instance.check.warmup", time.Second*1) v.SetDefault("instance.check.interval", time.Second*6) - v.SetDefault("instance.check.done_threshold", 5) + v.SetDefault("instance.check.done_threshold", 4) v.SetDefault("instance.check.installer.state", true) v.SetDefault("instance.check.installer.pause", true) @@ -66,7 +66,7 @@ func (c *Config) setDefaults() { v.SetDefault("instance.check.component_stable.skip", false) v.SetDefault("instance.check.component_stable.pids_ignored", []string{}) - v.SetDefault("instance.check.component_stable.pids_failed_activation", []string{"*"}) + v.SetDefault("instance.check.component_stable.pids_failed_activation", []string{}) v.SetDefault("instance.check.component_stable.pids_unsatisfied_reference", []string{}) v.SetDefault("instance.check.installer.skip", false) diff --git a/pkg/project/app_classic/aem/default/etc/aem.yml b/pkg/project/app_classic/aem/default/etc/aem.yml index 7a677cc3..0563177a 100755 --- a/pkg/project/app_classic/aem/default/etc/aem.yml +++ b/pkg/project/app_classic/aem/default/etc/aem.yml @@ -63,7 +63,7 @@ instance: # Time to wait for next state checking interval: 6s # Number of successful check attempts that indicates end of checking - done_threshold: 5 + done_threshold: 4 # Wait only for those instances whose state has been changed internally (unaware of external changes) await_strict: true # Max time to wait for the instance to be healthy after executing the start script or e.g deploying a package @@ -98,7 +98,7 @@ instance: component_stable: skip: false pids_ignored: [] - pids_failed_activation: ["*"] + pids_failed_activation: [] pids_unsatisfied_reference: [] # Sling Installer tracking installer: diff --git a/pkg/project/app_cloud/aem/default/etc/aem.yml b/pkg/project/app_cloud/aem/default/etc/aem.yml index 6dcbfc0b..071a9868 100755 --- a/pkg/project/app_cloud/aem/default/etc/aem.yml +++ b/pkg/project/app_cloud/aem/default/etc/aem.yml @@ -63,7 +63,7 @@ instance: # Time to wait for next state checking interval: 6s # Number of successful check attempts that indicates end of checking - done_threshold: 5 + done_threshold: 4 # Wait only for those instances whose state has been changed internally (unaware of external changes) await_strict: true # Max time to wait for the instance to be healthy after executing the start script or e.g deploying a package @@ -74,6 +74,7 @@ instance: timeout: 10m # Max time in which socket connection to instance should be established reachable: + skip: false timeout: 3s # Bundle state tracking bundle_stable: @@ -95,7 +96,7 @@ instance: component_stable: skip: false pids_ignored: [] - pids_failed_activation: ["*"] + pids_failed_activation: [] pids_unsatisfied_reference: [] # Sling Installer tracking installer: diff --git a/pkg/project/instance/aem/default/etc/aem.yml b/pkg/project/instance/aem/default/etc/aem.yml index 5e4568fb..2d28288a 100755 --- a/pkg/project/instance/aem/default/etc/aem.yml +++ b/pkg/project/instance/aem/default/etc/aem.yml @@ -63,7 +63,7 @@ instance: # Time to wait for next state checking interval: 6s # Number of successful check attempts that indicates end of checking - done_threshold: 5 + done_threshold: 4 # Max time to wait for the instance to be healthy after executing the start script or e.g deploying a package await_started: timeout: 30m @@ -96,7 +96,7 @@ instance: component_stable: skip: false pids_ignored: [] - pids_failed_activation: ["*"] + pids_failed_activation: [] pids_unsatisfied_reference: [] # Sling Installer tracking installer: