jobq: the core alias is a JobBuilder, not a Job
A JobBuilder holds pending nodes that are not in the graph yet — it is the thing you declare into. Naming the alias Job claimed it was the work itself, and the name propagated into every parameter derived from it (job: super::Job in run_node read as if it carried the DAG). Prose uses meaning the job *queue* are left alone: main.rs's "Job-queue scheduler" comment and the docs/coordinator.md reference. 315 tests pass unchanged.
This commit is contained in:
parent
8ce265fdf0
commit
379c9bb570
6 changed files with 42 additions and 42 deletions
|
|
@ -20,7 +20,7 @@ use super::*;
|
|||
/// Submit a declared shape with the metadata every mechanics test uses.
|
||||
/// `Source::Manual` because none of these exercise provenance — the tests that
|
||||
/// do name their own source at the call site.
|
||||
fn submit(q: &JobQueue, reason: &str, declare: impl FnOnce(&Job)) -> u64 {
|
||||
fn submit(q: &JobQueue, reason: &str, declare: impl FnOnce(&JobBuilder)) -> u64 {
|
||||
q.submit(Source::Manual, reason.to_owned(), declare)
|
||||
.expect("valid shape")
|
||||
}
|
||||
|
|
@ -29,7 +29,7 @@ fn ident(s: &str) -> hive_types::Ident {
|
|||
hive_types::Ident::parse(s).expect("valid test ident")
|
||||
}
|
||||
|
||||
fn rebuild(b: &Job, agent: &str) {
|
||||
fn rebuild(b: &JobBuilder, agent: &str) {
|
||||
templates::rebuild(b, agent, true);
|
||||
}
|
||||
|
||||
|
|
@ -37,14 +37,14 @@ fn rebuild(b: &Job, agent: &str) {
|
|||
/// shape (`[Signal→Drain→] StopForUpdate → Reconcile`, no `SetWanted` head)
|
||||
/// most queue-mechanics tests assume. Mirrors the pre-dynamic
|
||||
/// `templates::restart` (which is now the state-aware `submit::restart_nodes`).
|
||||
fn restart_online(b: &Job, agents: &[&str], graceful: bool) {
|
||||
fn restart_online(b: &JobBuilder, agents: &[&str], graceful: bool) {
|
||||
let targets: Vec<(String, bool)> = agents.iter().map(|a| ((*a).to_owned(), true)).collect();
|
||||
submit::restart_nodes(b, &targets, graceful);
|
||||
}
|
||||
|
||||
/// Stop shape with every agent treated as **running** — the online shape
|
||||
/// (`SetWanted → [Signal→Drain→](graceful) Reconcile`).
|
||||
fn stop_online(b: &Job, agents: &[&str], graceful: bool) {
|
||||
fn stop_online(b: &JobBuilder, agents: &[&str], graceful: bool) {
|
||||
let targets: Vec<(String, bool)> = agents.iter().map(|a| ((*a).to_owned(), true)).collect();
|
||||
submit::stop_nodes(b, &targets, graceful);
|
||||
}
|
||||
|
|
@ -426,7 +426,7 @@ fn rebuild_chain_is_declared_serial() {
|
|||
fn graceful_rebuild_chain_drains_before_stopping() {
|
||||
let q = JobQueue::new(1);
|
||||
let id = q
|
||||
.submit(Source::AutoUpdate, "sweep".to_owned(), |b: &Job| {
|
||||
.submit(Source::AutoUpdate, "sweep".to_owned(), |b: &JobBuilder| {
|
||||
templates::graceful_rebuild_nodes(b, "agent-a", true, None);
|
||||
})
|
||||
.expect("valid shape");
|
||||
|
|
@ -737,7 +737,7 @@ fn boot_sweep_nodes_declare_their_own_resources() {
|
|||
// compile; only an exhaustive caller list would have caught it.
|
||||
let q = JobQueue::new(4);
|
||||
let id = q
|
||||
.submit(Source::AutoUpdate, "boot".to_owned(), |b: &Job| {
|
||||
.submit(Source::AutoUpdate, "boot".to_owned(), |b: &JobBuilder| {
|
||||
crate::workers::auto_update::boot_nodes(
|
||||
b,
|
||||
true,
|
||||
|
|
@ -954,7 +954,7 @@ fn a_meta_lock_grows_one_rebuild_subgraph_per_agent() {
|
|||
let q = JobQueue::new(4);
|
||||
let agents = vec!["alice".to_owned(), "bob".to_owned()];
|
||||
let id = q
|
||||
.submit(Source::AutoUpdate, "sweep".to_owned(), |b: &Job| {
|
||||
.submit(Source::AutoUpdate, "sweep".to_owned(), |b: &JobBuilder| {
|
||||
templates::grown_graceful_rebuilds(b, &agents, true);
|
||||
})
|
||||
.expect("valid shape");
|
||||
|
|
|
|||
Loading…
Reference in a new issue