Merge branch 'feature/check-for-job-container-conflicts'

Author: Derek Smart

src/main/kotlin/com/delphix/yamlparser/Parser.kt

@@ -2,6 +2,8 @@ package com.delphix.yamlparser
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.*
+import com.github.ajalt.clikt.parameters.types.int
+
 import io.github.cdimascio.dotenv.dotenv as Dotenv
 
 import com.delphix.yamlparser.sdk.Delphix as Delphix
@@ -73,6 +75,8 @@ object Parser {
     class Parse : CliktCommand() {
         val env: String by option(help="Path to env file.").default(".env")
         val bookmark: String by option(help="Bookmark name.").default("")
+        val retryLimit: Int by option(help="Number of times to wait for a busy job.").int().default(5)
+        val waitTime: Int by option(help="Seconds to wait for a busy job before retrying.").int().default(30)
 
         override fun run(){
             val file = File("delphix.yaml")
@@ -94,7 +98,7 @@ object Parser {
             val env: Map<String, String> = loadEnvs(env)
             val delphix: Delphix = Delphix(Http(env["delphixEngine"]?: ""))
             val yaml: Yaml = Mapper().mapYaml(contents)
-            val runner: Runner = Runner(yaml, env, delphix, bookmark)
+            val runner: Runner = Runner(yaml, env, delphix, bookmark, retryLimit, waitTime)
 
             try {
                 runner.run()

src/main/kotlin/com/delphix/yamlparser/Runner.kt

@@ -9,7 +9,9 @@ class Runner (
     val yaml: Yaml,
     val env: Map<String, String>,
     val delphix: Delphix,
-    val bookmark: String
+    val bookmark: String,
+    val retryLimit: Int,
+    val waitTime: Int
 ) {
     var currentAction: JSONObject = JSONObject()
 
@@ -22,7 +24,6 @@ class Runner (
     }
 
     fun callDelphix(datapod: String, environment: String, event: String) {
-        delphix.login(env["delphixUser"]?: "", env["delphixPass"]?: "")
         when (event){
             "bookmark.create" -> currentAction = delphix.selfServiceBookmark().create(getBuildTag(environment), datapod)
             "bookmark.share" -> currentAction = delphix.selfServiceBookmark().share(getBuildTag(environment))
@@ -54,9 +55,29 @@ class Runner (
         }
     }
 
+    fun jobConflictExists(datapod: String): Boolean {
+        val container = delphix.selfServiceContainer().getRefByName(datapod)
+        var jobs = delphix.job().getWhereRunning()
+        for(job in jobs) {
+            if (job.target == container.reference) return true
+        }
+        return false
+    }
+
     fun execActionPhase(environment: Environment) {
-        for (action in environment.actions) {
+        loop@ for (action in environment.actions) {
             if (action.event == env["gitEvent"]) {
+                var tries = 1
+                while(jobConflictExists(environment.datapod)) {
+                    if (tries > retryLimit) {
+                        println("Retry Limit Exceeded for Job Conflict.")
+                        break@loop
+                    }
+                    println("Job Conflict Exists. Waiting $waitTime seconds to try again.")
+                    val waitMil = waitTime * 1000
+                    Thread.sleep(waitMil.toLong())
+                    tries++
+                }
                 callDelphix(environment.datapod, environment.name, action.action)
                 outputStatus(environment.name, action.event, action.action)
             } else {
@@ -66,6 +87,7 @@ class Runner (
     }
 
     fun run() {
+        delphix.login(env["delphixUser"]?: "", env["delphixPass"]?: "")
         for(environment in yaml.environments) {
             if (environment.branch == env["gitBranch"]) execActionPhase(environment)
         }

src/main/kotlin/com/delphix/yamlparser/sdk/repos/Job.kt

@@ -13,6 +13,26 @@ class Job (
 ) {
     val resource: String = "/resources/json/delphix/job"
 
+    fun list(): List<JobObj> {
+      var jobs = mutableListOf<JobObj>()
+      val response = http.handleGet("$resource").getJSONArray("result")
+      for (i in 0 until response.length()) {
+          val job = response.getJSONObject(i);
+          jobs.add(JobObj.fromJson(job))
+      }
+      return jobs
+    }
+
+    fun getWhereRunning(): List<JobObj> {
+      var jobs = mutableListOf<JobObj>()
+      val response = http.handleGet("$resource?jobState=RUNNING").getJSONArray("result")
+      for (i in 0 until response.length()) {
+          val job = response.getJSONObject(i);
+          jobs.add(JobObj.fromJson(job))
+      }
+      return jobs
+    }
+
     fun get(ref: String): JobObj {
         val response = http.handleGet("$resource/$ref")
         val job = JobObj.fromJson(response.getJSONObject("result"))

src/test/kotlin/com/delphix/yamlparser/RunnerTest.kt

@@ -24,7 +24,7 @@ class RunnerTest {
     val yaml: Yaml = Mapper().mapYaml(mapJsonToNode(jsonString))
     val env: Map<String, String> = mapOf("gitBranch" to "origin/develop", "gitCommit" to "0bb822091eed2ae15d67ed91f3ba8591b39e6c4e", "gitEvent" to "push", "delphixEngine" to "delphixEngine", "delphixUser" to "delphixUser", "delphixPass" to "delphixPass", "delphixRepository" to "Postgres vFiles (9.6.8)")
     val delphix : Delphix = mock()
-    val runner: Runner = Runner(yaml, env, delphix, "bookmark")
+    val runner: Runner = Runner(yaml, env, delphix, "bookmark", 5, 30)
 
     @Test fun `can call Delphix`() : Unit {
         /*