fix(nesinit): one thing reaps, and the workload stops alone

Three problems in the shutdown and reaping paths, all of them found in review.

Reaping and waiting cannot be two mechanisms. `waitpid(-1, ...)` collects any
child, so the reaper and a caller waiting on its own child race for the same
status, and whichever loses gets nothing — losing the workload's exit, which is
the one thing this component exists to report. The reaper is now the only
waiter and hands each exit to whoever asked for that pid. Registering interest
holds the same lock the delivery takes, so a child that exits before its caller
is registered is still delivered rather than dropped; there is a test that
fails without that.

Killing the workload killed everything. `kill(-1, SIGKILL)` is every process
init may signal, so a workload that overstayed its grace period took the
guest's services with it, before the ordered stop the shutdown promises them
had even started. It signals the one pid now.

The shutdown had no workload to stop. It built a fresh handle with no pid, so
the graceful stop was a no-op and the workload only died in the sweep that
follows — which is exactly the order this was written to avoid. The handle the
session used is now the handle the shutdown uses, and waiting for the workload
waits for that pid rather than for any child to leave.
This commit is contained in:
KAAL1
2026-09-05 09:30:10 +03:00
parent a461cbafa5
commit cb8f37a0e4
4 changed files with 222 additions and 57 deletions

View File

@@ -5,9 +5,12 @@
// for. Zombies hold a pid and a slot in the process table; a workload that
// leaks them in a long session eventually cannot fork.
use std::collections::HashMap;
use std::io;
use std::sync::{Arc, Mutex};
use nesprotocol::lifecycle::Exit;
use tokio::sync::oneshot;
/// Reap every child that has already exited, without blocking on any that
/// have not.
@@ -70,3 +73,54 @@ pub fn become_subreaper() -> io::Result<()> {
pub fn refuse_oom_kill() -> io::Result<()> {
std::fs::write("/proc/self/oom_score_adj", "-1000\n")
}
/// The children whose exit somebody is waiting for.
///
/// Reaping and waiting cannot be two mechanisms. `waitpid(-1, ...)` collects
/// any child, so a reaper running beside a caller that waits on its own child
/// will sometimes collect that child first and the caller's wait then fails
/// with no status — the exit is gone, and an exit is the one thing this
/// component exists to report. So the reaper is the only waiter, and this is
/// how it hands an exit to whoever asked for one.
#[derive(Clone, Default)]
pub struct Waiters(Arc<Mutex<HashMap<i32, oneshot::Sender<Exit>>>>);
impl Waiters {
pub fn new() -> Self {
Self::default()
}
/// Start something and be waiting for it before it can be reaped.
///
/// The lock is held across the spawn, and that is the whole point: a child
/// that exits immediately is reaped by a thread that has to take the same
/// lock to deliver the exit, so it waits until the slot exists rather than
/// finding none and dropping it.
pub fn watch<F>(&self, spawn: F) -> io::Result<oneshot::Receiver<Exit>>
where
F: FnOnce() -> io::Result<i32>,
{
let mut waiting = self.lock();
let pid = spawn()?;
let (sender, receiver) = oneshot::channel();
waiting.insert(pid, sender);
Ok(receiver)
}
/// Hand an exit to whoever is waiting for that pid. `false` if nobody is,
/// which is the common case: most of what an init reaps is an orphan
/// nothing asked about.
pub fn deliver(&self, pid: i32, exit: Exit) -> bool {
let Some(sender) = self.lock().remove(&pid) else {
return false;
};
// An error here means the caller stopped waiting, which is its right.
sender.send(exit).is_ok()
}
fn lock(&self) -> std::sync::MutexGuard<'_, HashMap<i32, oneshot::Sender<Exit>>> {
self.0
.lock()
.unwrap_or_else(|poisoned| poisoned.into_inner())
}
}