Instance stability checking impr (#941)

* Instance stability checking impr

* Done times

* Detekt fix

Author: krystian-panek-vmltech

src/main/kotlin/com/cognifide/gradle/aem/common/instance/action/AwaitDownAction.kt

@@ -54,9 +54,13 @@ class AwaitDownAction(aem: AemExtension) : DefaultAction(aem) {
 
     private val runner = CheckRunner(aem).apply {
         delay.apply {
-            convention(TimeUnit.SECONDS.toMillis(1))
+            convention(TimeUnit.SECONDS.toMillis(3))
             aem.prop.long("instance.awaitDown.delay")?.let { set(it) }
         }
+        doneTimes.apply {
+            convention(3)
+            aem.prop.long("instance.awaitDown.doneTimes")?.let { set(it) }
+        }
         verbose.apply {
             convention(true)
             aem.prop.boolean("instance.awaitDown.verbose")?.let { set(it) }

src/main/kotlin/com/cognifide/gradle/aem/common/instance/action/AwaitUpAction.kt

@@ -121,11 +121,19 @@ class AwaitUpAction(aem: AemExtension) : DefaultAction(aem) {
         unchangedOptions = options
     }
 
+    fun runner(options: CheckRunner.() -> Unit) {
+        runner.apply(options)
+    }
+
     private val runner = CheckRunner(aem).apply {
         delay.apply {
-            convention(TimeUnit.SECONDS.toMillis(1))
+            convention(TimeUnit.SECONDS.toMillis(3))
             aem.prop.long("instance.awaitUp.delay")?.let { set(it) }
         }
+        doneTimes.apply {
+            convention(5)
+            aem.prop.long("instance.awaitUp.doneTimes")?.let { set(it) }
+        }
         verbose.apply {
             aem.prop.boolean("instance.awaitUp.verbose")?.let { set(it) }
         }
@@ -156,4 +164,11 @@ class AwaitUpAction(aem: AemExtension) : DefaultAction(aem) {
 
         runner.check(instances)
     }
+
+    companion object {
+        fun quickOptions(): AwaitUpAction.() -> Unit = {
+            runner { doneTimes.set(1) }
+            unchanged { enabled.set(false) }
+        }
+    }
 }

src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/CheckRunner.kt

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.time.StopWatch
 import java.util.concurrent.Callable
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
 
 class CheckRunner(internal val aem: AemExtension) {
 
@@ -37,7 +38,7 @@ class CheckRunner(internal val aem: AemExtension) {
     }
 
     /**
-     * How long to wait after failed checking before checking again.
+     * How long to wait before checking instances again.
      */
     val delay = aem.obj.long { convention(0L) }
 
@@ -46,6 +47,11 @@ class CheckRunner(internal val aem: AemExtension) {
      */
     val timeout = aem.obj.long { convention(10_000L) }
 
+    /**
+     * How many times repeat checking to be sure if the done state is not only temporary.
+     */
+    val doneTimes = aem.obj.long { convention(1) }
+
     /**
      * Controls if aborted running should fail build.
      */
@@ -82,7 +88,7 @@ class CheckRunner(internal val aem: AemExtension) {
         }
     }
 
-    @Suppress("LoopWithTooManyJumpStatements", "TooGenericExceptionCaught")
+    @Suppress("LoopWithTooManyJumpStatements", "TooGenericExceptionCaught", "LongMethod")
     private fun ProgressIndicator.doChecking(instances: Collection<Instance>) {
         step = "Checking"
 
@@ -105,24 +111,40 @@ class CheckRunner(internal val aem: AemExtension) {
 
                 logger.info("Checking started for $instance")
 
+                var doneTime = 0L
                 do {
                     if (aborted) {
                         logger.info("Checking aborted for $instance!")
                         break
                     }
-
                     val checks = try {
                         val future = executors.submit(Callable { doChecking(progress) })
                         future.get(timeout.get(), TimeUnit.MILLISECONDS)
+                    } catch (e: TimeoutException) {
+                        doneTime = 0
+                        logger.info("Checking timed out for $instance")
+                        null
                     } catch (e: Exception) {
+                        doneTime = 0
                         logger.error("Checking failed for $instance!", e)
                         null
                     }
-                    if (checks != null && checks.done) {
-                        logger.info("Checking done for $instance")
-                        break
+                    if (checks != null) {
+                        if (checks.done) {
+                            if (doneTimes.get() <= 1) {
+                                logger.info("Checking done for $instance")
+                                break
+                            } else {
+                                doneTime++
+                                logger.info("Checking done ($doneTime/${doneTimes.get()}) for $instance")
+                                if (doneTime == doneTimes.get()) {
+                                    break
+                                }
+                            }
+                        } else {
+                            doneTime = 0
+                        }
                     }
-
                     Behaviors.waitFor(delay.get())
                 } while (isActive)
 

src/main/kotlin/com/cognifide/gradle/aem/common/instance/provision/Provisioner.kt

@@ -69,6 +69,7 @@ class Provisioner(val manager: InstanceManager) {
     private val steps = mutableListOf<Step>()
 
     private var awaitUpOptions: AwaitUpAction.() -> Unit = {
+        runner { doneTimes.set(1) }
         unchanged { enabled.set(false) }
     }
 

src/main/kotlin/com/cognifide/gradle/aem/instance/tasks/InstanceDeploy.kt

@@ -31,9 +31,7 @@ open class InstanceDeploy : Instance() {
         }
     }
 
-    private var awaitUpOptions: AwaitUpAction.() -> Unit = {
-        unchanged { enabled.set(false) }
-    }
+    private var awaitUpOptions: AwaitUpAction.() -> Unit = {}
 
     fun awaitUp(options: AwaitUpAction.() -> Unit) {
         this.awaitUpOptions = options

src/main/kotlin/com/cognifide/gradle/aem/instance/tasks/InstanceProvision.kt

@@ -17,9 +17,7 @@ open class InstanceProvision : Instance() {
         }
     }
 
-    private var awaitUpOptions: AwaitUpAction.() -> Unit = {
-        unchanged { enabled.set(false) }
-    }
+    private var awaitUpOptions = AwaitUpAction.quickOptions()
 
     fun awaitUp(options: AwaitUpAction.() -> Unit) {
         this.awaitUpOptions = options

src/main/kotlin/com/cognifide/gradle/aem/instance/tasks/InstanceUp.kt

@@ -8,9 +8,7 @@ import org.gradle.api.tasks.TaskAction
 
 open class InstanceUp : LocalInstance() {
 
-    private var awaitOptions: AwaitUpAction.() -> Unit = {
-        unchanged { enabled.set(false) }
-    }
+    private var awaitOptions = AwaitUpAction.quickOptions()
 
     /**
      * Controls instance awaiting.