Skip to content

Recover pending cancellation delivery after transient failures #759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Meta-Develop merged 2 commits into from
Oct 29, 2026
Merged

Recover pending cancellation delivery after transient failures #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c44b8d9
Recover pending cancellation delivery after transient failures
Meta-Develop Oct 29, 2026
d7a80f4
Merge branch 'main' into codex/steering-cancel-recovery-20261029
Meta-Develop Oct 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
169 changes: 113 additions & 56 deletions src/steering/plane.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@ struct LiveSlot {
pub struct SteeringPlane {
repo: PathBuf,
live: Arc<Mutex<BTreeMap<LiveKey, LiveSlot>>>,
#[cfg(test)]
cancel_failure: Arc<Mutex<Option<(String, String, CancelFailurePoint)>>>,
}

#[cfg(test)]
#[derive(Clone, Copy, PartialEq, Eq)]
pub(super) enum CancelFailurePoint {
BeforeInspection,
AfterDelivery,
BeforeAck,
}

impl SteeringPlane {
Expand All @@ -58,6 +68,8 @@ impl SteeringPlane {
Ok(Self {
repo,
live: Arc::new(Mutex::new(BTreeMap::new())),
#[cfg(test)]
cancel_failure: Arc::new(Mutex::new(None)),
})
}

Expand Down Expand Up @@ -530,6 +542,12 @@ impl SteeringPlane {
if existing.request != request {
return Ok(refused_ack(&request, SteeringRefusal::DuplicateAction));
}
if existing.refusal.is_none()
&& existing.outcome == SteeringOutcome::Pending
&& matches!(request.action, SteeringAction::CancelAssignment { .. })
{
return self.deliver_and_record(journal, &request, now_unix_ms);
}
return Ok(match existing.refusal {
Some(refusal) => refused_ack(&request, refusal),
None => accepted_ack(&request, existing.outcome),
Expand All @@ -549,67 +567,82 @@ impl SteeringPlane {
),
)?;

let delivery = self.deliver_locked(&request)?;
match delivery {
DeliveryResult::LostChild => {
append_event(
journal,
self.deliver_and_record(journal, &request, now_unix_ms)
})
}

fn deliver_and_record(
&self,
journal: &mut crate::state_journal::AuthenticatedStateJournal<
crate::steering::evidence::SteeringJournalSpec,
>,
request: &SteeringRequest,
now_unix_ms: u64,
) -> Result<SteeringDecision> {
let delivery = self.deliver_locked(request)?;
#[cfg(test)]
self.fail_cancel_at(request, CancelFailurePoint::AfterDelivery)?;
match delivery {
DeliveryResult::LostChild => {
append_event(
journal,
"lost_child",
&payload_for_request(
"lost_child",
&payload_for_request(
"lost_child",
&request,
SteeringOutcome::LostChild,
None,
None,
now_unix_ms,
),
)?;
Ok(accepted_ack(&request, SteeringOutcome::LostChild))
}
DeliveryResult::CancelledAndAcked => {
append_event(
journal,
request,
SteeringOutcome::LostChild,
None,
None,
now_unix_ms,
),
)?;
Ok(accepted_ack(request, SteeringOutcome::LostChild))
}
DeliveryResult::CancelledAndAcked => {
append_event(
journal,
"deliver",
&payload_for_request(
"deliver",
&payload_for_request(
"deliver",
&request,
SteeringOutcome::Delivered,
None,
None,
now_unix_ms,
),
)?;
append_event(
journal,
request,
SteeringOutcome::Delivered,
None,
None,
now_unix_ms,
),
)?;
#[cfg(test)]
self.fail_cancel_at(request, CancelFailurePoint::BeforeAck)?;
append_event(
journal,
"ack",
&payload_for_request(
"ack",
&payload_for_request(
"ack",
&request,
SteeringOutcome::Acknowledged,
None,
None,
now_unix_ms,
),
)?;
Ok(accepted_ack(&request, SteeringOutcome::Acknowledged))
}
DeliveryResult::Mailbox => {
append_event(
journal,
request,
SteeringOutcome::Acknowledged,
None,
None,
now_unix_ms,
),
)?;
Ok(accepted_ack(request, SteeringOutcome::Acknowledged))
}
DeliveryResult::Mailbox => {
append_event(
journal,
"deliver",
&payload_for_request(
"deliver",
&payload_for_request(
"deliver",
&request,
SteeringOutcome::Delivered,
None,
None,
now_unix_ms,
),
)?;
Ok(accepted_ack(&request, SteeringOutcome::Delivered))
}
request,
SteeringOutcome::Delivered,
None,
None,
now_unix_ms,
),
)?;
Ok(accepted_ack(request, SteeringOutcome::Delivered))
}
})
}
}

fn record_refusal(
Expand Down Expand Up @@ -654,6 +687,8 @@ impl SteeringPlane {

fn deliver_locked(&self, request: &SteeringRequest) -> Result<DeliveryResult> {
if matches!(request.action, SteeringAction::CancelAssignment { .. }) {
#[cfg(test)]
self.fail_cancel_at(request, CancelFailurePoint::BeforeInspection)?;
if let Some(cancellation) =
self.live_cancellation(&request.run_id, &request.assignment_id)?
{
Expand All @@ -675,6 +710,28 @@ impl SteeringPlane {
Ok(DeliveryResult::Mailbox)
}

#[cfg(test)]
pub(super) fn inject_cancel_failure(
&self,
request: &SteeringRequest,
point: CancelFailurePoint,
) {
*self.cancel_failure.lock().expect("cancel failure lock") =
Some((request.run_id.clone(), request.action_id.clone(), point));
}

#[cfg(test)]
fn fail_cancel_at(&self, request: &SteeringRequest, point: CancelFailurePoint) -> Result<()> {
let mut failure = self.cancel_failure.lock().expect("cancel failure lock");
if failure.as_ref() == Some(&(request.run_id.clone(), request.action_id.clone(), point))
&& matches!(request.action, SteeringAction::CancelAssignment { .. })
{
*failure = None;
bail!("injected cancellation delivery failure");
}
Ok(())
}

fn live_cancellation(
&self,
run_id: &str,
Expand Down
Loading
Loading