jobq: rename the builder parameters too, not just the alias
Renaming `pub type Job` fixed the definition and left every use site reading `b` and `job` — including `job: super::JobBuilder`, where the parameter still asserted it was a job while its type said otherwise. The propagation is what the issue was about, so the parameters are the half that matters at a call site. Two spots deliberately untouched: `auto_update`'s `sort_by(|a, b| …)` comparator, and the prose that means the job *queue* (main.rs's "Job-queue scheduler", scheduler.rs's "not this module's job any more", the "grown job rejected" log). 315 tests pass unchanged.
This commit is contained in:
parent
379c9bb570
commit
684f6da78e
6 changed files with 203 additions and 180 deletions
|
|
@ -327,7 +327,7 @@ pub async fn run(coord: Arc<Coordinator>) -> Result<()> {
|
|||
/// kind-derived resources were removed, which drops the agent lease a boot
|
||||
/// reconcile needs to not race another DAG's container ops.
|
||||
pub(crate) fn boot_nodes(
|
||||
b: &crate::job_queue::JobBuilder,
|
||||
builder: &crate::job_queue::JobBuilder,
|
||||
any_stale: bool,
|
||||
fanout: Vec<String>,
|
||||
drifted: Vec<String>,
|
||||
|
|
@ -341,7 +341,7 @@ pub(crate) fn boot_nodes(
|
|||
// ⇒ no meta commit on a no-change boot. The `fanout` list rides the
|
||||
// MetaLock into `run_meta_lock`, which appends the rebuild subgraphs.
|
||||
if any_stale {
|
||||
let _ = b
|
||||
let _ = builder
|
||||
.node(NodeKind::MetaLock {
|
||||
sweep: true,
|
||||
fanout: Some(fanout),
|
||||
|
|
@ -356,7 +356,9 @@ pub(crate) fn boot_nodes(
|
|||
for name in drifted {
|
||||
// Name the lease before the agent string moves into the kind.
|
||||
let lease = Resource::Agent(name.clone());
|
||||
let _ = b.node(NodeKind::Reconcile { agent: name }).needs(lease);
|
||||
let _ = builder
|
||||
.node(NodeKind::Reconcile { agent: name })
|
||||
.needs(lease);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue