#164 skipped the tmux probe whenever the stored boot id differed from the current one, assuming a changed boot id proves the tmux server is gone. It does not: a restored state directory, a VM or container snapshot rollback, or a truncated boot_id file all change it while tmux keeps running with live sessions. Every one of those sessions was then registered Dormant and stranded — resume respawns `maestro-<id>`, which collides with the name tmux still holds, so it failed 502 forever. Recovery now always runs `tmux list-sessions`, the single source of truth for liveness the rest of the daemon assumes. The boot id keeps its other job: telling a reboot from a restart in recovery's log. The #164 test asserted the old behaviour with tmux still alive, so it is replaced by one asserting the session is adopted Running, plus one covering a real reboot — boot id changed and the tmux server dead — still going dormant. Refs #174
66 lines
2.2 KiB
Rust
66 lines
2.2 KiB
Rust
//! Tells a daemon restart from a host reboot (#164).
|
|
//!
|
|
//! `/proc/sys/kernel/random/boot_id` is fixed for the life of the kernel and
|
|
//! changes on every boot. [`SessionManager::recover`] compares it against the
|
|
//! value it stored on the previous run and logs which of the two it was.
|
|
//!
|
|
//! It does not decide liveness (#174). A boot id changes without the tmux
|
|
//! server dying whenever the state directory is restored, a VM or container
|
|
//! snapshot is rolled back, or the `boot_id` file is truncated — so recovery
|
|
//! always probes `tmux list-sessions` and the boot id only says whether a
|
|
//! server that did not answer is coming back.
|
|
|
|
use std::path::Path;
|
|
|
|
/// Where the daemon reads the running kernel's boot id. Behind a trait so
|
|
/// tests can simulate a changed (or unreadable) boot id without rebooting the
|
|
/// machine.
|
|
pub trait BootIdSource: std::fmt::Debug + Send + Sync + 'static {
|
|
/// Current boot id, or `None` if it can't be determined (non-Linux,
|
|
/// restricted `/proc`, missing or empty file).
|
|
fn current(&self) -> Option<String>;
|
|
}
|
|
|
|
/// Production source: `/proc/sys/kernel/random/boot_id`.
|
|
#[derive(Debug, Default)]
|
|
pub struct ProcBootId;
|
|
|
|
impl BootIdSource for ProcBootId {
|
|
fn current(&self) -> Option<String> {
|
|
read_boot_id(Path::new("/proc/sys/kernel/random/boot_id"))
|
|
}
|
|
}
|
|
|
|
fn read_boot_id(path: &Path) -> Option<String> {
|
|
let contents = std::fs::read_to_string(path).ok()?;
|
|
let trimmed = contents.trim();
|
|
(!trimmed.is_empty()).then(|| trimmed.to_string())
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn reads_trimmed_contents() {
|
|
let dir = tempfile::tempdir().unwrap();
|
|
let path = dir.path().join("boot_id");
|
|
std::fs::write(&path, "abc-123\n").unwrap();
|
|
assert_eq!(read_boot_id(&path).as_deref(), Some("abc-123"));
|
|
}
|
|
|
|
#[test]
|
|
fn missing_file_returns_none() {
|
|
let dir = tempfile::tempdir().unwrap();
|
|
assert_eq!(read_boot_id(&dir.path().join("missing")), None);
|
|
}
|
|
|
|
#[test]
|
|
fn empty_file_returns_none() {
|
|
let dir = tempfile::tempdir().unwrap();
|
|
let path = dir.path().join("boot_id");
|
|
std::fs::write(&path, "\n").unwrap();
|
|
assert_eq!(read_boot_id(&path), None);
|
|
}
|
|
}
|