Merge pull request #354 from jglick/PlaceholderTask

Simplified `PlaceholderTask`
jenkinsci · Jan 30, 2024 · 63864b7 · 63864b7
2 parents 5337e0c + c52e84d
commit 63864b7
Show file tree

Hide file tree

Showing 5 changed files with 293 additions and 158 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/pickles/ExecutorPickle.java b/src/main/java/org/jenkinsci/plugins/workflow/support/pickles/ExecutorPickle.java
@@ -114,11 +114,10 @@ protected Executor tryResolve() throws Exception {
                     if (task instanceof ExecutorStepExecution.PlaceholderTask) {
                         ExecutorStepExecution.PlaceholderTask placeholder = (ExecutorStepExecution.PlaceholderTask)task;
 
-                        // Non-null cookie means body has begun execution, i.e. we started using a node
                         // PlaceholderTask#getAssignedLabel is set to the Node name when execution starts
                         // Thus we're guaranteeing the execution began and the Node is now unknown.
                         // Theoretically it's safe to simply fail earlier when rehydrating any EphemeralNode... but we're being extra safe.
-                        if (placeholder.getCookie() != null && Jenkins.get().getNode(placeholder.getAssignedLabel().getName()) == null ) {
+                        if (placeholder.hasStarted() && Jenkins.get().getNode(placeholder.getAssignedLabel().getName()) == null ) {
                             if (System.nanoTime() > endTimeNanos) {
                                 Queue.getInstance().cancel(item);
                                 owner.getListener().getLogger().printf("Killed %s after waiting for %s because we assume unknown agent %s is never going to appear%n",

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepDynamicContext.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepDynamicContext.java
@@ -69,7 +69,7 @@ public final class ExecutorStepDynamicContext implements Serializable {
 
     private static final long serialVersionUID = 1;
 
-    @NonNull ExecutorStepExecution.PlaceholderTask task;
+    final @NonNull ExecutorStepExecution.PlaceholderTask task;
     final @NonNull String node;
     final @NonNull String path;
     final int depth;
@@ -97,8 +97,6 @@ void resume(StepContext context) throws Exception {
         if (item == null) {
             throw new IllegalStateException("queue refused " + task);
         }
-        // Try to avoid having distinct a instance of PlaceholderTask here compared to any previously-scheduled task.
-        task = (ExecutorStepExecution.PlaceholderTask)item.task;
         LOGGER.fine(() -> (result.isCreated() ? "scheduled " : " using already-scheduled ") + item + " for " + path + " on " + node);
         TaskListener listener = context.get(TaskListener.class);
         if (!node.isEmpty()) { // unlikely to be any delay for built-in node anyway