fix(core): don't kill pipelines running on v3

spinnaker · May 1, 2017 · 4bd8587 · 4bd8587
1 parent 97960f3
commit 4bd8587
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/orca-core/src/main/groovy/com/netflix/spinnaker/orca/zombie/ZombiePipelineCleanupAgent.java b/orca-core/src/main/groovy/com/netflix/spinnaker/orca/zombie/ZombiePipelineCleanupAgent.java
@@ -30,6 +30,7 @@
 import rx.Observable;
 import static com.netflix.spinnaker.orca.ExecutionStatus.CANCELED;
 import static com.netflix.spinnaker.orca.ExecutionStatus.RUNNING;
+import static com.netflix.spinnaker.orca.pipeline.model.Execution.ExecutionEngine.v2;
 import static java.lang.String.format;
 import static java.time.Clock.systemDefaultZone;
 import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
@@ -42,6 +43,7 @@
 @Component
 @ConditionalOnExpression("${pollers.zombiePipeline.enabled:true}")
 @Slf4j
+@Deprecated
 public class ZombiePipelineCleanupAgent {
 
   /**
@@ -108,6 +110,7 @@ private Observable<Pipeline> findZombies() {
     return repository
       .retrievePipelines()
       .filter(this::isIncomplete)
+      .filter(this::isV2)
       .filter(this::isRunningOnZombieInstance)
       .doOnCompleted(() -> log.info("Zombie pipeline sweep completed."));
   }
@@ -148,4 +151,8 @@ private boolean isRunningOnZombieInstance(Pipeline pipeline) {
   private boolean isIncomplete(Pipeline pipeline) {
     return !pipeline.getStatus().isComplete();
   }
+
+  private boolean isV2(Pipeline pipeline) {
+    return pipeline.getExecutionEngine() == v2;
+  }
 }