Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better fix of timeout activity tick after restart #234

Merged
merged 2 commits into from
Aug 30, 2022
Merged

Better fix of timeout activity tick after restart #234

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85b6c33
Better fix of `timeout` activity tick after restart
jglick Aug 29, 2022
512d920
Reverting test changes since they seem to flake ~1%: https://github.c…
jglick Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions src/main/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepExecution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
Expand All @@ -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;
}
}
Expand Down Expand Up @@ -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);
}
}
Expand Down