Add versioned script library, reconcile permit refusals and compact helper captures
This commit is contained in:
@@ -526,6 +526,7 @@ pub async fn permit(
|
||||
payload_bytes: vec![],
|
||||
signature: vec![],
|
||||
denial_code: code.into(),
|
||||
unreserved_request: None,
|
||||
};
|
||||
let row=sqlx::query("SELECT j.*,a.authorization_id,a.revoked_at,a.principal AS approver,p.plan_hash,p.payload AS plan_payload,r.approval_state,i.enrollment_generation,i.assignment_version,i.asset_id AS bound_asset,i.capabilities,i.revoked_at AS device_revoked,i.connection_generation,t.changes_stopped FROM jobs j JOIN operations o ON o.tenant_id=j.tenant_id AND o.operation_id=j.operation_id JOIN authorizations a ON a.tenant_id=o.tenant_id AND a.authorization_id=o.authorization_id JOIN approval_requests r ON r.tenant_id=j.tenant_id AND r.operation_id=j.operation_id JOIN operation_plans p ON p.tenant_id=j.tenant_id AND p.plan_id=r.plan_id JOIN agent_installations i ON i.tenant_id=j.tenant_id AND i.agent_id=j.agent_id JOIN tenants t ON t.tenant_id=j.tenant_id WHERE j.job_id=$1 AND j.attempt_id=$2 AND j.agent_id=$3 FOR UPDATE OF j").bind(Uuid::parse_str(&r.job_id)?).bind(Uuid::parse_str(&r.attempt_id)?).bind(agent).fetch_optional(&mut *tx).await?;
|
||||
let Some(row) = row else {
|
||||
@@ -584,6 +585,13 @@ pub async fn permit(
|
||||
{
|
||||
return Ok(denied("BINDING_MISMATCH"));
|
||||
}
|
||||
// The locked row belongs to this request and has no start reservation.
|
||||
// Echo the binding only after both checks, so a client can safely return
|
||||
// this particular offer to scheduling after a fresh signed reconciliation.
|
||||
let denied = |code: &str| ExecutionPermit {
|
||||
unreserved_request: Some(r.clone()),
|
||||
..denied(code)
|
||||
};
|
||||
let now = Utc::now();
|
||||
if !payload
|
||||
.action
|
||||
@@ -702,7 +710,7 @@ pub async fn permit(
|
||||
)
|
||||
.fetch_one(&mut *tx)
|
||||
.await?;
|
||||
let concurrent:i64=sqlx::query_scalar("SELECT count(*) FROM jobs WHERE start_reserved AND state NOT IN ('succeeded','failed','cancelled','expired')").fetch_one(&mut *tx).await?;
|
||||
let concurrent:i64=sqlx::query_scalar("SELECT count(*) FROM jobs WHERE start_reserved AND state NOT IN ('succeeded','failed','cancelled','expired','closed_unknown')").fetch_one(&mut *tx).await?;
|
||||
if hourly >= i64::from(limits.0) || concurrent >= i64::from(limits.1) {
|
||||
return Ok(denied("QUOTA_EXCEEDED"));
|
||||
}
|
||||
@@ -710,7 +718,7 @@ pub async fn permit(
|
||||
dependency_group, ..
|
||||
} = &payload.action
|
||||
{
|
||||
let busy:bool=sqlx::query_scalar("SELECT EXISTS(SELECT 1 FROM jobs WHERE start_reserved AND state NOT IN ('succeeded','failed','cancelled','expired') AND (convert_from(payload,'UTF8')::jsonb->'action'->>'dependency_group'=$1 OR convert_from(payload,'UTF8')::jsonb->'action'->>'action'='reboot'))").bind(dependency_group).fetch_one(&mut *tx).await?;
|
||||
let busy:bool=sqlx::query_scalar("SELECT EXISTS(SELECT 1 FROM jobs WHERE start_reserved AND state NOT IN ('succeeded','failed','cancelled','expired','closed_unknown') AND (convert_from(payload,'UTF8')::jsonb->'action'->>'dependency_group'=$1 OR convert_from(payload,'UTF8')::jsonb->'action'->>'action'='reboot'))").bind(dependency_group).fetch_one(&mut *tx).await?;
|
||||
if busy {
|
||||
return Ok(denied("RESOURCE_LOCKED"));
|
||||
}
|
||||
@@ -727,11 +735,11 @@ pub async fn permit(
|
||||
.bind(row.get::<Uuid, _>("operation_id"))
|
||||
.fetch_one(&mut *tx)
|
||||
.await?;
|
||||
let active:i64=sqlx::query_scalar("SELECT count(*) FROM jobs WHERE operation_id=$1 AND start_reserved AND state NOT IN ('succeeded','failed','cancelled','expired')").bind(row.get::<Uuid,_>("operation_id")).fetch_one(&mut *tx).await?;
|
||||
let active:i64=sqlx::query_scalar("SELECT count(*) FROM jobs WHERE operation_id=$1 AND start_reserved AND state NOT IN ('succeeded','failed','cancelled','expired','closed_unknown')").bind(row.get::<Uuid,_>("operation_id")).fetch_one(&mut *tx).await?;
|
||||
if failures >= i64::from(plan.halt_after_failures) || active >= i64::from(plan.max_parallel) {
|
||||
return Ok(denied("ROLLOUT_PAUSED"));
|
||||
}
|
||||
let locked:bool=sqlx::query_scalar("SELECT EXISTS(SELECT 1 FROM jobs WHERE agent_id=$1 AND start_reserved AND state NOT IN ('succeeded','failed','cancelled','expired'))").bind(agent).fetch_one(&mut *tx).await?;
|
||||
let locked:bool=sqlx::query_scalar("SELECT EXISTS(SELECT 1 FROM jobs WHERE agent_id=$1 AND start_reserved AND state NOT IN ('succeeded','failed','cancelled','expired','closed_unknown'))").bind(agent).fetch_one(&mut *tx).await?;
|
||||
if locked {
|
||||
return Ok(denied("RESOURCE_LOCKED"));
|
||||
}
|
||||
@@ -776,6 +784,7 @@ pub async fn permit(
|
||||
payload_bytes: bytes,
|
||||
signature,
|
||||
denial_code: String::new(),
|
||||
unreserved_request: None,
|
||||
})
|
||||
}
|
||||
pub async fn next(
|
||||
|
||||
Reference in New Issue
Block a user