Skip to content

Fix finish_child Err arm to fall through to teardown #399

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

Merged
Finesssee merged 1 commit into from
Aug 29, 2026
Merged

Fix finish_child Err arm to fall through to teardown #399

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
10 changes: 5 additions & 5 deletions rust/src/host/command_runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ impl CommandRunner {
match child.try_wait() {
Ok(Some(status)) => return status.code(),
Ok(None) => {}
Err(_) => return None,
Err(_) => break,
}
if remaining.is_zero() {
break;
Expand All @@ -281,10 +281,10 @@ impl CommandRunner {
std::thread::sleep(step);
remaining -= step;
}
// Teardown after timeout/capture. If the process exited between the
// grace loop and kill (kill fails on an already-dead process), `wait`
// still yields the true exit status; when the kill lands, the code is
// ours and already reported separately.
// Teardown after timeout/capture or a transient try_wait error
// (e.g. ECHILD/handle race). If the process already exited, kill
// fails and `wait` still yields the true exit status; when the kill
// lands, the code is ours and already reported separately.
let killed = child.kill().is_ok();
let reaped = child.wait().ok();
if killed {
Expand Down
Loading