vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(#2772): is_settled distinguishes "not finished" from "no such node"

Browse source 
Returning `false` for an unknown id gave the same answer as a node that is
merely still running, so a caller polling a stale id would wait forever for
a state that can never arrive. `Option<bool>` makes the two cases separate,
matching `node()`'s convention that `None` means the id isn't in the graph.
This commit is contained in:
atlas 2026-07-27 20:16:28 +02:00 • committed by mara
commit 8c5de704be
2 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hive-c0re/src/job_queue/mod.rs
View file

@ -480,7 +480,7 @@ impl JobQueue {
inner inner
.containers() .containers()
.into_iter() .into_iter()
.filter(|&c| !inner.sched.graph().is_settled(c)) .filter(|&c| inner.sched.graph().is_settled(c) == Some(false))
.count() .count()
} }
} }
@ -652,7 +652,7 @@ impl QueueInner {
if !any_unsettled { if !any_unsettled {
return None; return None;
} }
let is_terminal = self.sched.graph().is_settled(container); let is_terminal = self.sched.graph().is_settled(container) == Some(true);
Some(DagView { Some(DagView {
id: container.get(), id: container.get(),
source: meta.source, source: meta.source,
@ -695,7 +695,7 @@ impl QueueInner {
let mut live: Vec<NodeId> = Vec::new(); let mut live: Vec<NodeId> = Vec::new();
let mut terminal: Vec<(NodeId, i64)> = Vec::new(); let mut terminal: Vec<(NodeId, i64)> = Vec::new();
for c in self.containers() { for c in self.containers() {
if self.sched.graph().is_settled(c) { if self.sched.graph().is_settled(c) == Some(true) {
terminal.push((c, self.dag_finished_at(c))); terminal.push((c, self.dag_finished_at(c)));
} else { } else {
live.push(c); live.push(c);

32
hive-jobq/src/lib.rs
View file

@ -488,13 +488,17 @@ impl<N, R> Graph<N, R> {
self.nodes.iter().filter(|n| n.parent.is_none()) self.nodes.iter().filter(|n| n.parent.is_none())
} }
/// Whether `id` has settled. A group root's state is its subtree's roll-up, /// Whether `id` has settled, or `None` when there is no such node. A group
/// so for a root this answers "is everything under it finished" — which is /// root's state is its subtree's roll-up, so for a root this answers "is
/// why callers don't scan the subtree themselves. Unknown ids are not /// everything under it finished" — which is why callers don't scan the
/// settled. /// subtree themselves.
///
/// `None` rather than `false` for an unknown id: "this node is not finished"
/// and "there is no such node" are different answers, and a caller that
/// conflates them keeps polling an id that will never settle.
#[must_use] #[must_use]
pub fn is_settled(&self, id: NodeId) -> bool { pub fn is_settled(&self, id: NodeId) -> Option<bool> {
self.node(id).is_some_and(|n| n.state.is_terminal()) self.node(id).map(|n| n.state.is_terminal())
} }
/// Why `id`'s subtree failed: the error of the first `Failed` descendant /// Why `id`'s subtree failed: the error of the first `Failed` descendant
@ -704,12 +708,20 @@ mod tests {
fn is_settled_tracks_node_state() { fn is_settled_tracks_node_state() {
let mut g: Graph<&str, String> = Graph::new(); let mut g: Graph<&str, String> = Graph::new();
let n = g.insert("n", vec![], None).unwrap(); let n = g.insert("n", vec![], None).unwrap();
assert!(!g.is_settled(n), "Pending is not settled"); assert_eq!(g.is_settled(n), Some(false), "Pending is not settled");
node_mut(&mut g, n).state = State::Finishing; node_mut(&mut g, n).state = State::Finishing;
assert!(!g.is_settled(n), "Finishing still has children running"); assert_eq!(
g.is_settled(n),
Some(false),
"Finishing still has children running"
);
node_mut(&mut g, n).state = State::Done; node_mut(&mut g, n).state = State::Done;
assert!(g.is_settled(n)); assert_eq!(g.is_settled(n), Some(true));
assert!(!g.is_settled(NodeId(99)), "unknown id is not settled"); assert_eq!(
g.is_settled(NodeId(99)),
None,
"an unknown id is not the same answer as `not settled`"
);
} }
#[test] #[test]