refactor(#2591): move the perm-change payload onto the WritePermFile node
This commit is contained in:
parent
be2dfa8cd3
commit
600bc051e1
9 changed files with 17 additions and 36 deletions
|
|
@ -76,7 +76,6 @@ pub struct Claim {
|
|||
pub template: Template,
|
||||
pub approval_id: Option<i64>,
|
||||
pub inputs: Vec<String>,
|
||||
pub perm_payload: Option<PermPayload>,
|
||||
/// Transient pill kind for the lease window (from the spec). Whether the
|
||||
/// pill is currently shown is derived from live lease ownership
|
||||
/// ([`JobQueue::held_transients`]), not a per-claim edge.
|
||||
|
|
@ -118,7 +117,6 @@ struct DagMeta {
|
|||
transient: Option<TransientKind>,
|
||||
approval_id: Option<i64>,
|
||||
inputs: Vec<String>,
|
||||
perm_payload: Option<PermPayload>,
|
||||
created_at: i64,
|
||||
}
|
||||
|
||||
|
|
@ -297,7 +295,6 @@ impl JobQueue {
|
|||
transient: spec.transient,
|
||||
approval_id: spec.approval_id,
|
||||
inputs: spec.inputs,
|
||||
perm_payload: spec.perm_payload,
|
||||
created_at: now_unix(),
|
||||
},
|
||||
Vec::new(),
|
||||
|
|
@ -387,7 +384,6 @@ impl JobQueue {
|
|||
template: meta.template,
|
||||
approval_id: meta.approval_id,
|
||||
inputs: meta.inputs,
|
||||
perm_payload: meta.perm_payload,
|
||||
transient: meta.transient,
|
||||
});
|
||||
if let Some(rt) = inner.node_rt.get_mut(&id) {
|
||||
|
|
@ -638,7 +634,6 @@ impl QueueInner {
|
|||
transient,
|
||||
approval_id,
|
||||
inputs,
|
||||
perm_payload,
|
||||
created_at,
|
||||
} = &self.sched.graph().node(container)?.payload
|
||||
else {
|
||||
|
|
@ -651,7 +646,6 @@ impl QueueInner {
|
|||
transient: *transient,
|
||||
approval_id: *approval_id,
|
||||
inputs: inputs.clone(),
|
||||
perm_payload: perm_payload.clone(),
|
||||
created_at: *created_at,
|
||||
})
|
||||
}
|
||||
|
|
@ -801,7 +795,6 @@ impl QueueInner {
|
|||
},
|
||||
inputs: meta.inputs.clone(),
|
||||
approval_id: meta.approval_id,
|
||||
perm_payload: meta.perm_payload.clone(),
|
||||
nodes,
|
||||
})
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue