Make start evidence atomic and recover only bound durable outcomes
Rust development slice / linux (push) Failing after 7s

This commit is contained in:
2026-11-14 02:01:17 +01:00
parent de3b408c34
commit 74736483df
13 changed files with 764 additions and 87 deletions
+1 -1
View File
@@ -59,7 +59,7 @@ fn supported_as(job: &JobPayload, uid: u32, helper_configured: bool) -> bool {
}
pub use rmm_agent_core::jobs::{
ack, event, events, interrupted, interrupted_request, next, no_start, permit_request,
requesting, reserve_request, result, transition,
recover_interrupted_outcome, requesting, reserve_request, result, transition,
};
pub fn accept(db: &Connection, binding: &Binding, offer: &JobOffer) -> Result<bool> {
rmm_agent_core::jobs::accept(db, binding, offer, |job| {
+11 -7
View File
@@ -212,10 +212,10 @@ impl<C: reconcile::SyncClock> Agent<C> {
/// New process only. Persist honest uncertainty before any helper snapshot
/// can block; the ordinary first-channel replay publishes it before Sync.
fn recover_interrupted(&mut self) -> Result<()> {
let Some(binding) = &self.binding else {
let Some(binding) = self.binding.clone() else {
return Ok(());
};
let interrupted = jobs::interrupted(&self.db, &self.ledger, binding)?;
let interrupted = jobs::interrupted(&self.db, &self.ledger, &binding)?;
for (offer, grant) in interrupted {
if grant.is_empty() {
jobs::interrupted_request(&self.db, &offer)?;
@@ -224,7 +224,10 @@ impl<C: reconcile::SyncClock> Agent<C> {
0,
&offer,
&grant,
rmm_privileged_helper::Outcome::unknown("AGENT_PROCESS_INTERRUPTED"),
jobs::recover_interrupted_outcome(&self.ledger, &binding, &offer, &grant)?
.unwrap_or_else(|| {
rmm_privileged_helper::Outcome::unknown("AGENT_PROCESS_INTERRUPTED")
}),
)?;
}
}
@@ -286,8 +289,7 @@ impl<C: reconcile::SyncClock> Agent<C> {
jobs::supported_with_binding(&job, Some(&binding)),
"UNSUPPORTED_CAPABILITY"
);
rmm_privileged_helper::consume(&mut self.ledger, &grant)?;
rmm_privileged_helper::save_start(&self.ledger, &grant, &request)?;
rmm_privileged_helper::begin_execution(&mut self.ledger, &grant, &request)?;
let cancelled: bool = self.db.query_row(
"SELECT cancel_requested FROM job_attempts WHERE job=?1 AND attempt=?2",
rusqlite::params![offer.job_id, offer.attempt_id],
@@ -295,6 +297,7 @@ impl<C: reconcile::SyncClock> Agent<C> {
)?;
if cancelled {
let outcome = jobs::no_start("cancelled", "CANCELLED_BEFORE_EFFECT");
rmm_privileged_helper::persist_outcome(&self.ledger, &grant, &outcome)?;
self.record(
generation,
&offer,
@@ -546,10 +549,11 @@ impl<C: reconcile::SyncClock> Agent<C> {
}
}
Some((offer, grant, outcome)) = self.completed_rx.recv() => {
// Persist the wire result before releasing a consumption lock.
// A crash in between is fail-closed, not a second execution.
// First preserve the original completion without unlocking.
// A startup can replay it if the journal transaction is lost.
let state = outcome.state.clone();
let refresh_capabilities=state=="succeeded" && serde_json::from_slice::<rmm_domain::jobs::JobPayload>(&offer.payload_bytes)?.action.name()=="apt_native_acceptance";
rmm_privileged_helper::persist_outcome(&self.ledger,&grant,&outcome)?;
let serialized = serde_json::to_vec(&outcome)?;
self.record(generation, &offer, &grant.grant_id.to_string(), outcome)?;
let outcome: rmm_privileged_helper::Outcome = serde_json::from_slice(&serialized)?;