Skip to content

[JENKINS-17116][JENKINS-59152] Fix build abort not killing processes on Windows reliably #4216

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

Closed
slonopotamus wants to merge 1 commit into from
Closed

[JENKINS-17116][JENKINS-59152] Fix build abort not killing processes on Windows reliably #4216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 24 additions & 27 deletions core/src/main/java/hudson/util/ProcessTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,45 +514,41 @@ public OSProcess getParent() {

@Override
public void killRecursively() throws InterruptedException {
if (getVeto() != null)
return;
long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(softKillWaitSeconds);
killRecursively(deadline);
}

LOGGER.log(FINER, "Killing recursively {0}", getPid());
// Firstly try to kill the root process gracefully, then do a forcekill if it does not help (algorithm is described in JENKINS-17116)
killSoftly();
p.killRecursively();
killByKiller();
private void killRecursively(long deadline) throws InterruptedException {
LOGGER.fine("Recursively killing pid="+getPid());
for (OSProcess p : getChildren()) {
if (p instanceof WindowsOSProcess) {
((WindowsOSProcess)p).killRecursively(deadline);
} else {
p.killRecursively(); // should not happen, fallback to non-deadline version
}
}
kill(deadline);
}

@Override
public void kill() throws InterruptedException {
long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(softKillWaitSeconds);
kill(deadline);
}

private void kill(long deadline) throws InterruptedException {
if (getVeto() != null) {
return;
}

LOGGER.log(FINER, "Killing {0}", getPid());
// Firstly try to kill it gracefully, then do a forcekill if it does not help (algorithm is described in JENKINS-17116)
killSoftly();
p.kill();
killByKiller();
}

private void killSoftly() throws InterruptedException {
// send Ctrl+C to the process
final int pid = getPid();
LOGGER.log(FINER, "Killing {0}", pid);
try {
if (!p.sendCtrlC()) {
return;
}
}
catch (WinpException e) {
if (LOGGER.isLoggable(Level.FINE)) {
LOGGER.log(Level.FINE, "Failed to send CTRL+C to pid=" + getPid(), e);
}
p.kill();
} catch (WinpException e) {
LOGGER.log(Level.INFO, "Failed to terminate pid=" + pid, e);
return;
}

// after that wait for it to cease to exist
long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(softKillWaitSeconds);
int sleepTime = 10; // initially we sleep briefly, then sleep up to 1sec
do {
if (!p.isRunning()) {
Expand All @@ -562,6 +558,7 @@ private void killSoftly() throws InterruptedException {
Thread.sleep(sleepTime);
sleepTime = Math.min(sleepTime * 2, 1000);
} while (System.nanoTime() < deadline);
killByKiller();
}

@Override
Expand Down