Merge pull request #259 from jglick/stopping

Try to remove items from completed builds even if supposedly already cancelled
jenkinsci · Nov 16, 2022 · 38306d8 · 38306d8
2 parents 8628f21 + 16915df
commit 38306d8
Showing 1 changed file with 6 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
@@ -441,8 +441,12 @@ public String getCookie() {
             if (FlowExecutionList.get().isResumptionComplete()) {
                 // We only do this if resumption is complete so that we do not load the run and resume its execution in this context in normal scenarios.
                 Run<?, ?> run = runForDisplay();
-                if (!stopping && run != null && !run.isLogUpdated()) {
-                    stopping = true;
+                if (run != null && !run.isLogUpdated()) {
+                    if (stopping) {
+                        LOGGER.warning(() -> "Refusing to build " + PlaceholderTask.this + " and going to cancel it, even though it was supposedly stopped already, because associated build is complete");
+                    } else {
+                        stopping = true;
+                    }
                     Timer.get().execute(() -> {
                         if (Queue.getInstance().cancel(this)) {
                             LOGGER.warning(() -> "Refusing to build " + PlaceholderTask.this + " and cancelling it because associated build is complete");