fix(pipelines): Do not change status to CANCELED if pipeline executio…

…n has already completed. (#217)
spinnaker · Jan 26, 2018 · 80c8529 · 80c8529
1 parent 0509d58
commit 80c8529
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/PipelineController.java b/kayenta-orca/src/main/java/com/netflix/kayenta/orca/controllers/PipelineController.java
@@ -114,6 +114,13 @@ List<ExecutionLogEntry> logs(@PathVariable String executionId) {
   void cancel(@PathVariable String executionId) {
     log.info("Cancelling pipeline execution {}...", executionId);
 
+    Execution pipeline = executionRepository.retrieve(Execution.ExecutionType.PIPELINE, executionId);
+
+    if (pipeline.getStatus().isComplete()) {
+      log.debug("Not changing status of pipeline execution {} to CANCELED since execution is already completed: {}", executionId, pipeline.getStatus());
+      return;
+    }
+
     executionRepository.cancel(executionId);
     executionRepository.updateStatus(executionId, ExecutionStatus.CANCELED);
   }