ExecutorPickle should not reschedule anything until after `Queue.lo…

…ad` (#184)
jenkinsci · Nov 22, 2021 · 08e8ce1 · 08e8ce1
1 parent 7479b9b
commit 08e8ce1
Showing 1 changed file with 7 additions and 1 deletion.
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
@@ -29,6 +29,7 @@
 import hudson.Extension;
 import hudson.Main;
 import hudson.Util;
+import hudson.init.InitMilestone;
 import hudson.model.Executor;
 import hudson.model.Node;
 import hudson.model.OneOffExecutor;
@@ -87,10 +88,14 @@ private ExecutorPickle(Executor executor) {
     @Override public ListenableFuture<Executor> rehydrate(final FlowExecutionOwner owner) {
         return new TryRepeatedly<Executor>(1, 0) {
             long itemID;
-            long endTimeNanos = System.nanoTime() + TIMEOUT_WAITING_FOR_NODE_MILLIS*1000000;
+            long endTimeNanos;
 
             @Override
             protected Executor tryResolve() throws Exception {
+                if (Jenkins.get().getInitLevel() != InitMilestone.COMPLETED) {
+                    LOGGER.fine(() -> "not going to schedule " + task + " yet because Jenkins has not yet completed startup");
+                    return null;
+                }
                 Queue.Item item;
                 if (itemID == 0) { // Not scheduled yet
                     item = Queue.getInstance().schedule2(task, 0).getItem();
@@ -99,6 +104,7 @@ protected Executor tryResolve() throws Exception {
                         throw new IllegalStateException("queue refused " + task);
                     }
                     itemID = item.getId();
+                    endTimeNanos = System.nanoTime() + TIMEOUT_WAITING_FOR_NODE_MILLIS*1000000;
                     LOGGER.log(Level.FINE, "{0} scheduled {1}", new Object[] {ExecutorPickle.this, item});
                 } else {
                     item = Queue.getInstance().getItem(itemID);