Merge pull request #209 from wttech/instance-deployment-waiting

Instance deployment waiter

Author: krystian-panek-vmltech

core/src/main/java/dev/vml/es/acm/core/script/ScriptScheduler.java

@@ -24,6 +24,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.ResourceResolver;
@@ -59,6 +61,8 @@ public class ScriptScheduler implements ResourceChangeListener, EventListener, J
 
  public static final String JOB_TOPIC = "dev/vml/es/acm/ScriptScheduler";
 
+ public static final String DEPLOY_THREAD_NAME = "ScriptScheduler-Deploy";
+
  public static final String JOB_PROP_TYPE = "type";
 
  public static final String JOB_PROP_SCRIPT_PATH = "scriptPath";
@@ -95,10 +99,15 @@ public static JobType of(String value) {
  description = "Interval in milliseconds to retry health check if instance is not healthy")
  long healthCheckRetryInterval() default 1000 * 10; // 10 seconds
 
+ @AttributeDefinition(
+ name = "Health Check Retry Count On Deployment",
+ description = "Maximum number of retries when checking instance health on deployment")
+ long healthCheckRetryCountDeployment() default 90; // * 10 seconds = 15 minutes
+
  @AttributeDefinition(
  name = "Health Check Retry Count On Boot",
  description = "Maximum number of retries when checking instance health on boot script execution")
- long healthCheckRetryCountBoot() default 90; // * 10 seconds = 15 minutes
+ long healthCheckRetryCountBoot() default 60; // * 10 seconds = 10 minutes
 
  @AttributeDefinition(
  name = "Health Check Retry Count On Cron Schedule",
@@ -131,12 +140,15 @@ public static JobType of(String value) {
 
  private Config config;
 
+ private ExecutorService deployJobExecutor;
+
  @Activate
  protected void activate(Config config) {
  this.config = config;
 
  if (checkInstanceReady()) {
- bootWhenInstanceUp();
+ deployJobExecutor = Executors.newSingleThreadExecutor(r -> new Thread(r, DEPLOY_THREAD_NAME));
+ deployJobExecutor.execute(this::deployJob);
  }
  }
 
@@ -147,6 +159,10 @@ protected void modify(Config config) {
 
  @Deactivate
  protected void deactivate() {
+ if (deployJobExecutor != null) {
+ deployJobExecutor.shutdownNow();
+ deployJobExecutor = null;
+ }
  unscheduleBoot();
  unscheduleScripts();
  bootedScripts.clear();
@@ -232,6 +248,16 @@ private ScheduleResult determineSchedule(Script script, ResourceResolver resourc
  }
  }
 
+ // Sling scheduler does not work during deployment on AEMaaCS, so we need to postpone boot job
+ private void deployJob() {
+ LOG.info("Instance deployment - job started");
+ if (awaitInstanceHealthy(
+ "Instance deployment", config.healthCheckRetryCountDeployment(), config.healthCheckRetryInterval())) {
+ bootWhenInstanceUp();
+ }
+ LOG.info("Instance deployment - job finished");
+ }
+
  private void bootJob() {
  LOG.info("Automatic scripts booting - job started");
  unscheduleScripts();

test/project/setup.sh

@@ -53,7 +53,7 @@ add_vendor_package() {
  <groupId>${groupId}</groupId>
  <artifactId>${artifactId}</artifactId>
  <type>${type}</type>
- <target>/apps/${PROJECT_NAME}-vendor-packages/container/install</target>
+ <target>/apps/${PROJECT_NAME}-vendor-packages/application/install</target>
  </embedded>"
  local all_pom="all/pom.xml"