Merge pull request #234 from jglick/TimeoutStepExecution

Better fix of `timeout` activity tick after restart
jenkinsci · Aug 30, 2022 · d57e3ca · d57e3ca
2 parents 43d80fe + 512d920
commit d57e3ca
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepExecution.java
@@ -142,6 +142,7 @@ private void setupTimer(final long now, boolean forceReset) {
     }
 
     private void resetTimer() {
+        LOGGER.fine(() -> "resetting timer on " + id);
         long now = System.currentTimeMillis();
         end = now + timeout;
         setupTimer(now, true);
@@ -340,9 +341,6 @@ public OutputStream decorateLogger(@SuppressWarnings("rawtypes") Run build, fina
             OutputStream decorated = new LineTransformationOutputStream() {
                 @Override
                 protected void eol(byte[] b, int len) throws IOException {
-                    if (channel == null) {
-                        new ResetTimer(id).call();
-                    }
                     logger.write(b, 0, len);
                     active.set(true);
                 }
@@ -359,9 +357,7 @@ public void close() throws IOException {
                     logger.close();
                 }
             };
-            if (channel != null) {
-                new Tick(active, new WeakReference<>(decorated), timeout, channel, id).schedule();
-            }
+            new Tick(active, new WeakReference<>(decorated), timeout, channel, id).schedule(0);
             return decorated;
         }
     }
@@ -397,16 +393,14 @@ public void run() {
                 } else {
                     resetTimer.call();
                 }
-                schedule();
+                schedule(timeout / 2); // less than the full timeout, to give some grace period, but in the same ballpark to avoid overhead
             } else {
                 // Idle at the moment, but check well before the timeout expires in case new output appears.
                 schedule(timeout / 10);
             }
         }
-        void schedule() {
-            schedule(timeout / 2); // less than the full timeout, to give some grace period, but in the same ballpark to avoid overhead
-        }
         private void schedule(long delay) {
+            LOGGER.fine(() -> "scheduling tick for " + Util.getTimeSpanString(delay));
             Timer.get().schedule(this, delay, TimeUnit.MILLISECONDS);
         }
     }