Fix Chronos job deletion (don't fail if the job doesn't exist)

See #34
indigo-dc · May 25, 2016 · 7b35d92 · 7b35d92
1 parent 51790e3
commit 7b35d92
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/ChronosServiceImpl.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/ChronosServiceImpl.java
@@ -459,8 +459,15 @@ protected boolean deleteJobsOnChronos(Deployment deployment,
       currentJob = job;
 
       try {
-        client.deleteJob(job.getChronosJob().getName());
-        LOG.debug("Deleted job on Chronos: name <{}>", currentJob.getChronosJob().getName());
+        String jobName = job.getChronosJob().getName();
+
+        // Chronos API hack (to avoid error 400 if the job to delete does not exist)
+        if (getJobStatus(client, jobName) == null) {
+          LOG.debug("Job on Chronos does not exist: name <{}>", jobName);
+        } else {
+          client.deleteJob(jobName);
+          LOG.debug("Deleted job on Chronos: name <{}>", jobName);
+        }
       } catch (ChronosException ce) {
         // Just log the error
         String errorMsg = String.format("Failed to delete job <%s> on Chronos. Status Code: <%s>",