If the user asks to stop a shell step twice, force it to die.

Works around bugs like JENKINS-25678 which would otherwise make the flow unkillable.
jenkinsci · Nov 19, 2014 · 9901d51 · 9901d51
1 parent 90a4f60
commit 9901d51
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/...step/src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java b/...step/src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java
@@ -82,6 +82,7 @@ public static final class Execution extends AbstractStepExecutionImpl implements
         @StepContextParameter private transient Launcher launcher;
         @StepContextParameter private transient TaskListener listener;
         private transient long recurrencePeriod;
+        private transient int stopAttempt;
         private Controller controller;
         private String node;
         private String remote;
@@ -140,9 +141,15 @@ public static final class Execution extends AbstractStepExecutionImpl implements
         }
 
         @Override public void stop(Throwable cause) throws Exception {
-            FilePath workspace = getWorkspace();
-            if (workspace != null) {
-                controller.stop(workspace);
+            try {
+                FilePath workspace = getWorkspace();
+                if (workspace != null) {
+                    controller.stop(workspace);
+                }
+            } finally {
+                if (stopAttempt++ == 1) { // second attempt
+                    getContext().onFailure(cause);
+                }
             }
         }
 
@@ -151,7 +158,7 @@ public static final class Execution extends AbstractStepExecutionImpl implements
             try {
                 check();
             } finally {
-                if (recurrencePeriod > 0) {
+                if (recurrencePeriod > 0 && stopAttempt < 2) {
                     Timer.get().schedule(this, recurrencePeriod, TimeUnit.MILLISECONDS);
                 }
             }