refactor(#2815): derive the transient pill from the running node
The dashboard pill was declared once per DAG at submit time, so a rebuild reported `rebuilding` for its entire life — through the prebuild, the stop, the swap, the tail and the reconcile. It named the intent of the request, not what was happening. It is now read off the nodes actually running. A node lights a pill when it is `Running` and declares the agent's own resource. Declaring is the test, not targeting: `Prebuild` and `MetaSync` name an agent but are lease-exempt on purpose (the container keeps serving), so they must not light one. It is also not the lease *owner* — `resource_state()` answers "who holds the slot", which is a different question from "what is running", and a descendant that borrows an ancestor's grant never appears in that map. `TransientKind` is gone entirely rather than being re-derived. The label is the node's own wire tag (`NodeKind::as_str`) — the same vocabulary `NodeView.kind` already ships, so a pill and a DAG node name an operation identically and there is no second taxonomy to keep in step. Work with no node behind it (destroy, migration) supplies its own literal. `DagSpec::transient`, `Claim::transient`, `DagMeta::transient` and `NodeKind::Dag`'s `transient` field all go with it. ## the safety half, which is deliberately not the display half `crash_watch::is_deliberate_stop` used to match a `TransientKind` to decide whether a vanished container was intentional or a crash. That made a pill's display vocabulary decide an alerting question, so renaming or adding a label would silently move the alerting boundary. `TransientState` now carries two independent fields: `label` (rendered, nothing branches on it) and `deliberate_stop` (read only by the crash watcher). The producer sets the second, because the producer is the only thing that knows — it is not recoverable from the first. For queue work that value is `NodeKind::takes_container_down()`, and it is emphatically not "holds a lease": `Create` and `Start` hold the agent's lease exactly like `Stop` does, and a container dying *while starting* is a real crash that must keep reporting as one. The default is `false` on purpose — a wrong `false` costs a spurious crash event, a wrong `true` swallows a real crash silently. ## known cost, accepted on the issue A restart no longer reads `restarting`. No `NodeKind` is unique to a restart — `restart_chain` reuses `Signal` / `StopForUpdate` / `Drain` / `Reconcile` — because "restart" is a property of the DAG's shape, not of any node. A restart now reads `signal` / `stop_for_update`, then the agent returns. `Start` / `Stop` / `PostSwap` run inside a lease-holding ancestor and re-declare nothing, so they light no pill and the agent reads idle for those windows. Closing that is the resources-where-constructed work (#2818), not this change. Checked with clippy (`--all-targets -D warnings`), `cargo test -p hive-c0re -p hive-jobq` (321 + 40 passed) and `nix fmt`.
This commit is contained in:
parent
0aac20d863
commit
d3d73b5ffb
14 changed files with 295 additions and 261 deletions
|
|
@ -246,7 +246,7 @@ fn graceful_rebuild_chain_drains_before_stopping() {
|
|||
let spec = DagSpec {
|
||||
source: Source::AutoUpdate,
|
||||
reason: "sweep".to_owned(),
|
||||
transient: None,
|
||||
|
||||
nodes: templates::rebuild_nodes(
|
||||
"agent-a",
|
||||
templates::RebuildOpts {
|
||||
|
|
@ -430,7 +430,7 @@ fn lease_serializes_two_lifecycle_dags_for_same_agent() {
|
|||
let restart = submit(&q, restart_online(&["agent-a"], false, "restart"));
|
||||
let stop = submit(
|
||||
&q,
|
||||
templates::reconcile_only("agent-a", Source::Manual, "stop".to_owned(), None),
|
||||
templates::reconcile_only("agent-a", Source::Manual, "stop".to_owned()),
|
||||
);
|
||||
// Restart's first node (StopForUpdate) takes the lease; stop's
|
||||
// Reconcile must wait even though slots are free.
|
||||
|
|
@ -461,7 +461,7 @@ fn lease_exempt_prebuild_overlaps_other_dag_on_same_agent() {
|
|||
submit(&q, rebuild("agent-a", "rebuild"));
|
||||
submit(
|
||||
&q,
|
||||
templates::reconcile_only("agent-a", Source::Manual, "stop".to_owned(), None),
|
||||
templates::reconcile_only("agent-a", Source::Manual, "stop".to_owned()),
|
||||
);
|
||||
// Both DAGs' heads are lease-independent of each other: the rebuild's
|
||||
// MetaSync (meta window) and the stop's Reconcile (agent lease).
|
||||
|
|
@ -723,7 +723,7 @@ fn append_subgraph_roots_on_emitter_and_rebases_local_deps() {
|
|||
let spec = DagSpec {
|
||||
source: Source::AutoUpdate,
|
||||
reason: "sweep".to_owned(),
|
||||
transient: None,
|
||||
|
||||
nodes: vec![NodeSpec {
|
||||
kind: NodeKind::MetaLock {
|
||||
sweep: true,
|
||||
|
|
@ -789,26 +789,55 @@ fn drain_meta_syncs(q: &JobQueue) -> Vec<(String, String)> {
|
|||
rest
|
||||
}
|
||||
|
||||
/// Crash-watch suppression for a cascade rebuild, which the deleted half of
|
||||
/// `meta_update_grows_cascade_in_dag` used to assert via `DagSpec::transient`.
|
||||
///
|
||||
/// The property is unchanged — a container going down under a rebuild must not
|
||||
/// read as a crash — but it is no longer a DAG-level declaration: each node
|
||||
/// answers for itself, so the assertion moves to the nodes a cascade actually
|
||||
/// runs. Kept as its own test rather than dropped, because it is the *property*
|
||||
/// that mattered, not the field that used to carry it.
|
||||
#[test]
|
||||
fn meta_update_carries_rebuilding_transient_and_grows_cascade_in_dag() {
|
||||
fn rebuild_chain_nodes_suppress_crash_watch() {
|
||||
for kind in [
|
||||
NodeKind::StopForUpdate {
|
||||
agent: "a".to_owned(),
|
||||
},
|
||||
NodeKind::Swap {
|
||||
agent: "a".to_owned(),
|
||||
},
|
||||
NodeKind::Drain {
|
||||
agent: "a".to_owned(),
|
||||
},
|
||||
] {
|
||||
assert!(
|
||||
kind.takes_container_down(),
|
||||
"{} must suppress crash-watch — a rebuild takes the container down \
|
||||
on purpose",
|
||||
kind.as_str()
|
||||
);
|
||||
}
|
||||
// The counter-case, and the reason this can't be "any node in a rebuild":
|
||||
// the tail brings the container back up, so a container that dies there
|
||||
// really did crash.
|
||||
assert!(
|
||||
!NodeKind::Start {
|
||||
agent: "a".to_owned()
|
||||
}
|
||||
.takes_container_down()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn meta_update_grows_cascade_in_dag() {
|
||||
// The meta-update `MetaLock` grows one rebuild subgraph per affected
|
||||
// agent into its OWN DAG (via append_subgraph), not child DAGs.
|
||||
// The DAG carries `Rebuilding` so the folded rebuilds keep crash-watch
|
||||
// suppression (the property the old child Rebuild DAGs had via their own
|
||||
// transient).
|
||||
let spec = templates::meta_update(
|
||||
vec!["nixpkgs".to_owned()],
|
||||
Source::Manual,
|
||||
"bump".to_owned(),
|
||||
None,
|
||||
);
|
||||
assert!(
|
||||
matches!(
|
||||
spec.transient,
|
||||
Some(crate::coordinator::TransientKind::Rebuilding)
|
||||
),
|
||||
"meta-update DAG must carry Rebuilding so cascade rebuilds get suppression"
|
||||
);
|
||||
let q = JobQueue::new(4);
|
||||
let id = submit(&q, spec);
|
||||
let meta_lock = claim_one(&q);
|
||||
|
|
@ -981,7 +1010,7 @@ fn failed_reconcile_marks_dag_failed() {
|
|||
let q = JobQueue::new(1);
|
||||
let id = submit(
|
||||
&q,
|
||||
templates::reconcile_only("agent-a", Source::Manual, "start".to_owned(), None),
|
||||
templates::reconcile_only("agent-a", Source::Manual, "start".to_owned()),
|
||||
);
|
||||
let c = claim_one(&q);
|
||||
q.complete_node(c.node_id, Err("start failed".to_owned()));
|
||||
|
|
@ -1132,7 +1161,7 @@ fn dag_settles_terminal_and_releases_lease_after_work() {
|
|||
// immediately.
|
||||
let next = submit(
|
||||
&q,
|
||||
templates::reconcile_only("agent-a", Source::Manual, "stop".to_owned(), None),
|
||||
templates::reconcile_only("agent-a", Source::Manual, "stop".to_owned()),
|
||||
);
|
||||
let c = claim_one(&q);
|
||||
assert_eq!(c.dag_id, next);
|
||||
|
|
@ -1401,12 +1430,7 @@ fn history_evicts_oldest_terminals_past_flat_cap() {
|
|||
for i in 0..(MAX_HISTORY_DAGS + OVERFLOW) {
|
||||
let id = submit(
|
||||
&q,
|
||||
templates::reconcile_only(
|
||||
&format!("agent-{i}"),
|
||||
Source::Manual,
|
||||
"start".to_owned(),
|
||||
None,
|
||||
),
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in a new issue