From fe4b5d64d280a04e23c0460cd1f087b6dea8be28 Mon Sep 17 00:00:00 2001 From: Willem Vanhulle Date: Sun, 25 Oct 2026 13:20:44 +0100 Subject: [PATCH] fix: keep units that finished before a reconnect in the counts --- src/boot_model.rs | 1 - src/boot_model/job_ingestion.rs | 25 +++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/boot_model.rs b/src/boot_model.rs index 785c55a..4329907 100644 --- a/src/boot_model.rs +++ b/src/boot_model.rs @@ -116,7 +116,6 @@ pub struct BootState { pub manager_exited_at: Option, pub milestone_targets: Vec, boot_finished: bool, - finished_before_reconnect: usize, units: HashMap, jobs: HashMap, } diff --git a/src/boot_model/job_ingestion.rs b/src/boot_model/job_ingestion.rs index 0d8811a..a5ef5f5 100644 --- a/src/boot_model/job_ingestion.rs +++ b/src/boot_model/job_ingestion.rs @@ -88,7 +88,6 @@ impl BootState { manager_exited_at: None, milestone_targets, boot_finished: false, - finished_before_reconnect: 0, units: HashMap::new(), jobs: HashMap::new(), } @@ -190,7 +189,7 @@ impl BootState { .count(); self.finished_stages.push(FinishedStage { label: Phase::Initrd.label(), - finished_units: finished_here + self.finished_before_reconnect, + finished_units: finished_here, failed_units: self .units .values() @@ -201,20 +200,15 @@ impl BootState { }); self.phase = Phase::Host; self.root = Root::Unresolved; - self.finished_before_reconnect = 0; self.units.clear(); self.jobs.clear(); } pub fn forget_jobs(&mut self) { - self.finished_before_reconnect += self - .units - .values() - .filter(|record| record.is_finished()) - .count(); self.jobs.clear(); self.units .values_mut() + .filter(|record| matches!(record.progress, Progress::Pending(_))) .for_each(|record| record.progress = Progress::Untouched); } @@ -249,8 +243,7 @@ impl BootState { .finished_stages .iter() .map(|stage| stage.finished_units) - .sum::() - + self.finished_before_reconnect, + .sum::(), failed: self.failed.len(), ..Tally::default() }; @@ -306,6 +299,18 @@ mod tests { assert!(!state.is_complete()); } + #[test] + fn reconnecting_keeps_the_finished_units() { + let mut state = sample(); + state.finish_job(7, JobResult::Done, 2000 * MS); + let tally = state.tally(); + let milestones = state.milestones(); + state.forget_jobs(); + assert_eq!(state.tally().done, tally.done); + assert_eq!(state.milestones(), milestones); + assert!(!milestones.is_empty()); + } + #[test] fn boot_completes_once_the_requeued_root_job_is_gone() { let mut state = sample();