Merge pull request #357 from jglick/diag-JENKINS-60507

[JENKINS-60507] Extra diagnostic log
jenkinsci · Feb 8, 2024 · c8c2fed · c8c2fed
2 parents b8c1814 + 5869a37
commit c8c2fed
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java
@@ -955,11 +955,14 @@ private static final class Callback extends BodyExecutionCallback.TailCall {
                 execution.body = null;
                 RunningTask t = RunningTasks.get(execution.getContext());
                 if (t != null) {
-                    LOGGER.fine(() -> "cancelling any leftover task from " + execution.getContext());
                     boolean _stopping = t.stopping;
                     t.stopping = true;
                     try {
-                        Queue.getInstance().cancel(execution.state.task);
+                        if (Queue.getInstance().cancel(execution.state.task)) {
+                            LOGGER.fine(() -> "cancelled leftover task from " + execution.getContext());
+                        } else {
+                            LOGGER.fine(() -> "was unable to cancel any leftover task from " + execution.getContext());
+                        }
                     } finally {
                         t.stopping = _stopping;
                     }