Merge pull request #218 from wttech/components-check-aborting

Components check aborting

Author: krystian-panek-vmltech

examples/docker/src/aem/default/etc/aem.yml

@@ -72,12 +72,15 @@ instance:
       timeout: 10m
     # Max time in which socket connection to instance should be established
     reachable:
+      skip: false
       timeout: 3s
     # Bundle state tracking
     bundle_stable:
+      skip: false
       symbolic_names_ignored: []
     # OSGi events tracking
     event_stable:
+      skip: false
       # Topics indicating that instance is not stable
       topics_unstable:
         - "org/osgi/framework/ServiceEvent/*"
@@ -91,18 +94,26 @@ instance:
       received_max_age: 5s
     # OSGi components state tracking
     component_stable:
+      skip: false
+      abort: true
       pids_ignored: []
       pids_failed_activation: ["*"]
       pids_unsatisfied_reference: []
     # Sling Installer tracking
     installer:
+      skip: false
       # JMX state checking
       state: true
       # Pause Installation nodes checking
       pause: true
     # Specific endpoints / paths (like login page)
     path_ready:
       timeout: 10s
+    login_page:
+      skip: false
+      path: "/libs/granite/core/content/login.html"
+      status_code: 200
+      contained_text: QUICKSTART_HOMEPAGE
 
   # Managed locally (set up automatically)
   local:

pkg/cfg/defaults.go

@@ -65,6 +65,7 @@ func (c *Config) setDefaults() {
 	v.SetDefault("instance.check.event_stable.details_ignored", []string{"*.*MBean", "org.osgi.service.component.runtime.ServiceComponentRuntime", "java.util.ResourceBundle"})
 
 	v.SetDefault("instance.check.component_stable.skip", false)
+	v.SetDefault("instance.check.component_stable.abort", true)
 	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_unsatisfied_reference", []string{})

pkg/check.go

@@ -187,6 +187,7 @@ func (c EventStableChecker) Check(_ CheckContext, instance Instance) CheckResult
 
 type ComponentStableChecker struct {
 	Skip                     bool
+	Abort                    bool
 	PIDsIgnored              []string
 	PIDsFailedActivation     []string
 	PIDsUnsatisfiedReference []string
@@ -197,6 +198,7 @@ func NewComponentStableChecker(opts *CheckOpts) ComponentStableChecker {
 
 	return ComponentStableChecker{
 		Skip:                     cv.GetBool("instance.check.component_stable.skip"),
+		Abort:                    cv.GetBool("instance.check.component_stable.abort"),
 		PIDsIgnored:              cv.GetStringSlice("instance.check.component_stable.pids_ignored"),
 		PIDsFailedActivation:     cv.GetStringSlice("instance.check.component_stable.pids_failed_activation"),
 		PIDsUnsatisfiedReference: cv.GetStringSlice("instance.check.component_stable.pids_unsatisfied_reference"),
@@ -225,6 +227,7 @@ func (c ComponentStableChecker) Check(_ CheckContext, instance Instance) CheckRe
 		message := fmt.Sprintf("some components failed activation (%d): '%s'", failedComponentCount, failedComponents[0].PID)
 		return CheckResult{
 			ok:      false,
+			abort:   c.Abort,
 			message: message,
 		}
 	}
@@ -237,6 +240,7 @@ func (c ComponentStableChecker) Check(_ CheckContext, instance Instance) CheckRe
 		message := fmt.Sprintf("some components unsatisfied (%d): '%s'", unsatisfiedComponentCount, unsatisfiedComponents[0].PID)
 		return CheckResult{
 			ok:      false,
+			abort:   c.Abort,
 			message: message,
 		}
 	}

pkg/project/app_classic/aem/default/etc/aem.yml

@@ -74,12 +74,15 @@ instance:
       timeout: 10m
     # Max time in which socket connection to instance should be established
     reachable:
+      skip: false
       timeout: 3s
     # Bundle state tracking
     bundle_stable:
+      skip: false
       symbolic_names_ignored: []
     # OSGi events tracking
     event_stable:
+      skip: false
       # Topics indicating that instance is not stable
       topics_unstable:
         - "org/osgi/framework/ServiceEvent/*"
@@ -93,19 +96,26 @@ instance:
       received_max_age: 5s
     # OSGi components state tracking
     component_stable:
+      skip: false
+      abort: true
       pids_ignored: []
       pids_failed_activation: ["*"]
       pids_unsatisfied_reference: []
     # Sling Installer tracking
     installer:
+      skip: false
       # JMX state checking
       state: true
       # Pause Installation nodes checking
       pause: true
     # Specific endpoints / paths (like login page)
     path_ready:
       timeout: 10s
-
+    login_page:
+      skip: false
+      path: "/libs/granite/core/content/login.html"
+      status_code: 200
+      contained_text: QUICKSTART_HOMEPAGE
 
   # Managed locally (set up automatically)
   local:

pkg/project/app_cloud/aem/default/etc/aem.yml

@@ -93,18 +93,26 @@ instance:
       received_max_age: 5s
     # OSGi components state tracking
     component_stable:
+      skip: false
+      abort: true
       pids_ignored: []
       pids_failed_activation: ["*"]
       pids_unsatisfied_reference: []
     # Sling Installer tracking
     installer:
+      skip: false
       # JMX state checking
       state: true
       # Pause Installation nodes checking
       pause: true
     # Specific endpoints / paths (like login page)
     path_ready:
       timeout: 10s
+    login_page:
+      skip: false
+      path: "/libs/granite/core/content/login.html"
+      status_code: 200
+      contained_text: QUICKSTART_HOMEPAGE
 
   # Managed locally (set up automatically)
   local:

pkg/project/instance/aem/default/etc/aem.yml

@@ -72,12 +72,15 @@ instance:
       timeout: 10m
     # Max time in which socket connection to instance should be established
     reachable:
+      skip: false
       timeout: 3s
     # Bundle state tracking
     bundle_stable:
+      skip: false
       symbolic_names_ignored: []
     # OSGi events tracking
     event_stable:
+      skip: false
       # Topics indicating that instance is not stable
       topics_unstable:
         - "org/osgi/framework/ServiceEvent/*"
@@ -91,18 +94,26 @@ instance:
       received_max_age: 5s
     # OSGi components state tracking
     component_stable:
+      skip: false
+      abort: true
       pids_ignored: []
       pids_failed_activation: ["*"]
       pids_unsatisfied_reference: []
     # Sling Installer tracking
     installer:
+      skip: false
       # JMX state checking
       state: true
       # Pause Installation nodes checking
       pause: true
     # Specific endpoints / paths (like login page)
     path_ready:
       timeout: 10s
+    login_page:
+      skip: false
+      path: "/libs/granite/core/content/login.html"
+      status_code: 200
+      contained_text: QUICKSTART_HOMEPAGE
 
   # Managed locally (set up automatically)
   local: