c0re: history retention is a policy, split from the graph it reads
`visible_dags` mixed two things: walking the graph to classify containers live-vs-terminal, and the sort-and-truncate that decides what the dashboard sees. `retain_history` is the second half, generic over the handle so it is reachable without a graph at all — a `NodeId` cannot be fabricated, so a test forced to pass real ones could only get them by submitting and running DAGs. Which is exactly what the old test did: `MAX_HISTORY_DAGS + 8` submits, claim and fail each node, read the ids back out of a snapshot — the scheduler, the roll-up and the wire projection all standing in the path of a policy that reads none of them. And it only ever exercised the tiebreak, because every DAG in that loop settled inside the same wall-clock second, so `finished_at` tied on all of them. Eviction *by time* — the actual policy — had no coverage. It does now, along with the live-never-competes case. `live_count` and `templates::reconcile_only` were both test-only and lose their last caller here.
This commit is contained in:
parent
5f5898d167
commit
ab5744a2bd
3 changed files with 72 additions and 68 deletions
|
|
@ -1451,36 +1451,59 @@ fn deploy_apply_grows_rebuild_subgraph_and_finalizes_after_it() {
|
|||
/// The dashboard renders one recent-builds list, so one number bounds it —
|
||||
/// and with no bucketing there's nothing for a burst of same-shaped DAGs to
|
||||
/// evict early, which is what the grace window used to paper over.
|
||||
///
|
||||
/// `retain_history` is a sort-and-truncate over `(handle, finished_at,
|
||||
/// tiebreak)`. This used to submit `MAX_HISTORY_DAGS + 8` DAGs, claim and fail
|
||||
/// each one's node, then read the ids back out of a snapshot — the scheduler,
|
||||
/// the roll-up and the wire projection all in the path of a policy that reads
|
||||
/// none of them.
|
||||
///
|
||||
/// Calling it directly also reaches the half the round-trip never could: every
|
||||
/// DAG in that loop settled inside the same wall-clock second, so `finished_at`
|
||||
/// tied on all of them and **only** the tiebreak was ever exercised. Eviction
|
||||
/// by time — the actual policy — went untested.
|
||||
#[test]
|
||||
fn history_evicts_oldest_terminals_past_flat_cap() {
|
||||
const OVERFLOW: usize = 8;
|
||||
let q = JobQueue::new(1);
|
||||
let mut ids = Vec::new();
|
||||
for i in 0..(MAX_HISTORY_DAGS + OVERFLOW) {
|
||||
let id = submit(
|
||||
&q,
|
||||
templates::reconcile_only(&format!("agent-{i}"), Source::Manual, "start".to_owned()),
|
||||
);
|
||||
let c = claim_one(&q);
|
||||
// Fail the single work node so the DAG *lingers*: a fully-`Done` DAG
|
||||
// drops off the wire entirely, but a `Failed` one is retained (+
|
||||
// history-capped) so the operator can still triage it. Completing the
|
||||
// node rolls the container up terminal.
|
||||
q.complete_node(c.node_id, Err("boom".to_owned()));
|
||||
ids.push(id);
|
||||
}
|
||||
let kept: std::collections::HashSet<u64> = q.snapshot().iter().map(|d| d.id).collect();
|
||||
assert_eq!(kept.len(), MAX_HISTORY_DAGS, "flat history cap");
|
||||
// Newest-first: the oldest `OVERFLOW` fall off, everything after survives.
|
||||
// These DAGs settle within the same wall-clock second, so this also pins
|
||||
// the `NodeId`-descending tiebreak that orders them when `finished_at` ties.
|
||||
for old in &ids[..OVERFLOW] {
|
||||
assert!(!kept.contains(old), "oldest terminal {old} evicted");
|
||||
}
|
||||
for recent in &ids[OVERFLOW..] {
|
||||
assert!(kept.contains(recent), "recent terminal {recent} retained");
|
||||
}
|
||||
assert_eq!(q.live_count(), 0);
|
||||
fn history_retains_live_dags_and_the_newest_terminals() {
|
||||
const CAP: usize = 3;
|
||||
// Live DAGs are kept whole, regardless of the cap.
|
||||
assert_eq!(
|
||||
retain_history(vec!["live-a", "live-b"], vec![], CAP),
|
||||
vec!["live-a", "live-b"],
|
||||
);
|
||||
// Terminals: newest `finished_at` first, oldest evicted past the cap.
|
||||
assert_eq!(
|
||||
retain_history(
|
||||
vec![],
|
||||
vec![
|
||||
("oldest", 100, 1),
|
||||
("newest", 400, 2),
|
||||
("middle", 200, 3),
|
||||
("later", 300, 4),
|
||||
],
|
||||
CAP,
|
||||
),
|
||||
vec!["newest", "later", "middle"],
|
||||
"the oldest terminal falls off"
|
||||
);
|
||||
// Same second → the tiebreak decides, descending, so the DAG inserted
|
||||
// last wins. This is the *common* case: a burst settles together.
|
||||
assert_eq!(
|
||||
retain_history(
|
||||
vec![],
|
||||
vec![("a", 100, 1), ("b", 100, 2), ("c", 100, 3), ("d", 100, 4)],
|
||||
CAP,
|
||||
),
|
||||
vec!["d", "c", "b"],
|
||||
);
|
||||
// A live DAG never competes with history for the cap.
|
||||
assert_eq!(
|
||||
retain_history(
|
||||
vec!["live"],
|
||||
vec![("a", 100, 1), ("b", 200, 2), ("c", 300, 3), ("d", 400, 4)],
|
||||
CAP,
|
||||
),
|
||||
vec!["live", "d", "c", "b"],
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
Loading…
Reference in a new issue