fix: keep units that finished before a reconnect in the counts
This commit is contained in:
1 parent
d3fcd6f085
commit
fe4b5d64d2
2 files changed
+15
-11
No files matched your search
@@ -116,7 +116,6 @@ pub struct BootState {
|
|||||||
pub manager_exited_at: Option<Duration>,
|
pub manager_exited_at: Option<Duration>,
|
||||||
pub milestone_targets: Vec<String>,
|
pub milestone_targets: Vec<String>,
|
||||||
boot_finished: bool,
|
boot_finished: bool,
|
||||||
finished_before_reconnect: usize,
|
|
||||||
units: HashMap<String, UnitRecord>,
|
units: HashMap<String, UnitRecord>,
|
||||||
jobs: HashMap<u32, String>,
|
jobs: HashMap<u32, String>,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,7 +88,6 @@ impl BootState {
|
|||||||
manager_exited_at: None,
|
manager_exited_at: None,
|
||||||
milestone_targets,
|
milestone_targets,
|
||||||
boot_finished: false,
|
boot_finished: false,
|
||||||
finished_before_reconnect: 0,
|
|
||||||
units: HashMap::new(),
|
units: HashMap::new(),
|
||||||
jobs: HashMap::new(),
|
jobs: HashMap::new(),
|
||||||
}
|
}
|
||||||
@@ -190,7 +189,7 @@ impl BootState {
|
|||||||
.count();
|
.count();
|
||||||
self.finished_stages.push(FinishedStage {
|
self.finished_stages.push(FinishedStage {
|
||||||
label: Phase::Initrd.label(),
|
label: Phase::Initrd.label(),
|
||||||
finished_units: finished_here + self.finished_before_reconnect,
|
finished_units: finished_here,
|
||||||
failed_units: self
|
failed_units: self
|
||||||
.units
|
.units
|
||||||
.values()
|
.values()
|
||||||
@@ -201,20 +200,15 @@ impl BootState {
|
|||||||
});
|
});
|
||||||
self.phase = Phase::Host;
|
self.phase = Phase::Host;
|
||||||
self.root = Root::Unresolved;
|
self.root = Root::Unresolved;
|
||||||
self.finished_before_reconnect = 0;
|
|
||||||
self.units.clear();
|
self.units.clear();
|
||||||
self.jobs.clear();
|
self.jobs.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn forget_jobs(&mut self) {
|
pub fn forget_jobs(&mut self) {
|
||||||
self.finished_before_reconnect += self
|
|
||||||
.units
|
|
||||||
.values()
|
|
||||||
.filter(|record| record.is_finished())
|
|
||||||
.count();
|
|
||||||
self.jobs.clear();
|
self.jobs.clear();
|
||||||
self.units
|
self.units
|
||||||
.values_mut()
|
.values_mut()
|
||||||
|
.filter(|record| matches!(record.progress, Progress::Pending(_)))
|
||||||
.for_each(|record| record.progress = Progress::Untouched);
|
.for_each(|record| record.progress = Progress::Untouched);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -249,8 +243,7 @@ impl BootState {
|
|||||||
.finished_stages
|
.finished_stages
|
||||||
.iter()
|
.iter()
|
||||||
.map(|stage| stage.finished_units)
|
.map(|stage| stage.finished_units)
|
||||||
.sum::<usize>()
|
.sum::<usize>(),
|
||||||
+ self.finished_before_reconnect,
|
|
||||||
failed: self.failed.len(),
|
failed: self.failed.len(),
|
||||||
..Tally::default()
|
..Tally::default()
|
||||||
};
|
};
|
||||||
@@ -306,6 +299,18 @@ mod tests {
|
|||||||
assert!(!state.is_complete());
|
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]
|
#[test]
|
||||||
fn boot_completes_once_the_requeued_root_job_is_gone() {
|
fn boot_completes_once_the_requeued_root_job_is_gone() {
|
||||||
let mut state = sample();
|
let mut state = sample();
|
||||||
|
|||||||
Reference in new issue
Block a user