Add fenced attempt mutation and outcome publication

This commit is contained in:
ms2k 2026-07-17 07:40:36 +09:00
commit 80c631f780
5 changed files with 1868 additions and 18 deletions

View file

@ -1,10 +1,17 @@
mod error;
mod migrate;
mod mutation_types;
mod mutations;
mod service;
mod types;
pub use error::AttemptError;
pub use migrate::migrate;
pub use mutation_types::{
AttemptMutationOutcome, CheckpointProjection, CheckpointRecord, CommittedManifestRecord,
CommittedResultRecord, DurableDescriptor, FailureRecord, JobMutationProjection,
MutationRejection, ProgressRecord,
};
pub use service::{AttemptConfig, AttemptService};
pub use types::{
ActivationOutcome, AttemptAuthority, AttemptFaultInjector, AttemptFaultPoint, AttemptState,

View file

@ -0,0 +1,130 @@
use remora_domain::{FailureDisposition, JobPhase, OpaqueId, RuntimeFailureClass};
use remora_durable::MutationDisposition;
use remora_result::PublicationInput;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
pub struct DurableDescriptor {
pub id: OpaqueId,
pub schema_version: u32,
pub byte_length: u64,
pub item_count: Option<u64>,
pub checksum: String,
}
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
pub struct CheckpointRecord {
pub descriptor: DurableDescriptor,
pub resolved_source_id: OpaqueId,
pub validated_bytes: u64,
pub validated_members: u64,
}
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
#[serde(tag = "state", rename_all = "snake_case")]
pub enum CheckpointProjection {
Reusable {
checkpoint: CheckpointRecord,
},
Complete {
validated_bytes: u64,
validated_members: u64,
},
}
impl CheckpointProjection {
pub(crate) fn reusable(&self) -> Option<&CheckpointRecord> {
match self {
Self::Reusable { checkpoint } => Some(checkpoint),
Self::Complete { .. } => None,
}
}
}
#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
pub struct ProgressRecord {
pub completed_bytes: u64,
pub total_bytes: Option<u64>,
pub completed_members: u64,
pub total_members: Option<u64>,
}
#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
#[serde(rename_all = "snake_case")]
pub enum MutationRejection {
AuthorityLost,
RequiredState,
CancellationRequested,
ResolvedSourceConflict,
ResolvedSourceRequired,
CheckpointSourceMismatch,
CheckpointRegression,
ProgressRegression,
InvalidResult,
}
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum AttemptMutationOutcome {
Accepted(MutationDisposition),
Rejected {
reason: MutationRejection,
disposition: MutationDisposition,
},
}
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct JobMutationProjection {
pub phase: JobPhase,
pub revision: u64,
pub authority_attempt_id: Option<OpaqueId>,
pub resolved_source: Option<DurableDescriptor>,
pub checkpoint: Option<CheckpointProjection>,
pub committed_result: Option<CommittedResultRecord>,
pub failure: Option<FailureRecord>,
}
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
pub struct CommittedResultRecord {
pub attempt_id: OpaqueId,
pub manifest_id: OpaqueId,
pub schema_version: u32,
pub manifest: CommittedManifestRecord,
pub member_count: u64,
pub total_bytes: u64,
}
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
pub struct CommittedManifestRecord {
pub store: String,
pub bucket: String,
pub key: String,
pub version_id: Option<String>,
pub sha256: String,
pub size: u64,
}
impl From<&PublicationInput> for CommittedResultRecord {
fn from(value: &PublicationInput) -> Self {
Self {
attempt_id: value.attempt_id.clone(),
manifest_id: value.manifest_id.clone(),
schema_version: value.schema_version,
manifest: CommittedManifestRecord {
store: value.manifest.identity.target_store_id.clone(),
bucket: value.manifest.identity.bucket.clone(),
key: value.manifest.identity.key.clone(),
version_id: value.manifest.identity.version_id.clone(),
sha256: value.manifest.content_sha256.as_str().into(),
size: value.manifest.size,
},
member_count: value.member_count,
total_bytes: value.total_bytes,
}
}
}
#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)]
pub struct FailureRecord {
pub class: RuntimeFailureClass,
pub disposition: FailureDisposition,
}

View file

@ -0,0 +1,637 @@
use remora_coordination::{LeaseOwner, MAX_SAFE_INTEGER, OpCode, ProgressValue};
use remora_domain::{
FailureDisposition, JobPhase, OpaqueId, RuntimeFailureClass, fingerprint, ports::MutationScope,
};
use remora_durable::{
DurableError, MutationDisposition, MutationOutcome, MutationStatus, enqueue, execute_mutation,
};
use remora_result::PublicationInput;
use serde::Serialize;
use serde_json::{Value, json};
use sqlx::types::Json;
use time::OffsetDateTime;
use crate::{
AttemptAuthority, AttemptError, AttemptMutationOutcome, AttemptService, CheckpointProjection,
CheckpointRecord, CommittedResultRecord, DurableDescriptor, FailureRecord,
JobMutationProjection, MutationRejection, ProgressRecord,
};
impl AttemptService {
pub async fn pin_resolved_source(
&self,
authority: &AttemptAuthority,
operation_id: &OpaqueId,
descriptor: DurableDescriptor,
) -> Result<AttemptMutationOutcome, AttemptError> {
validate_descriptor(&descriptor)?;
let fingerprint_input = descriptor.clone();
self.execute_durable_mutation(
authority,
operation_id,
"pin_resolved_source",
&fingerprint_input,
move |tx, authority| {
Box::pin(async move {
let Some(row) = lock_executing(tx, &authority).await? else {
return rejected(MutationRejection::AuthorityLost);
};
if row.cancel_requested {
return rejected(MutationRejection::CancellationRequested);
}
if let Some(current) = row.resolved_source {
return if current == descriptor {
accepted()
} else {
rejected(MutationRejection::ResolvedSourceConflict)
};
}
let now = OffsetDateTime::now_utc();
sqlx::query(
"UPDATE jobs SET resolved_source = $2, revision = revision + 1,
updated_at = $3 WHERE job_id = $1",
)
.bind(authority.job_id.as_str())
.bind(Json(&descriptor))
.bind(now)
.execute(tx.as_mut())
.await?;
enqueue(tx, "job.updated", json!({ "job_id": authority.job_id })).await?;
accepted()
})
},
)
.await
}
pub async fn persist_checkpoint(
&self,
authority: &AttemptAuthority,
operation_id: &OpaqueId,
checkpoint: CheckpointRecord,
) -> Result<AttemptMutationOutcome, AttemptError> {
validate_checkpoint(&checkpoint)?;
let fingerprint_input = checkpoint.clone();
self.execute_durable_mutation(
authority,
operation_id,
"persist_checkpoint",
&fingerprint_input,
move |tx, authority| {
Box::pin(async move {
let Some(row) = lock_executing(tx, &authority).await? else {
return rejected(MutationRejection::AuthorityLost);
};
if row.cancel_requested {
return rejected(MutationRejection::CancellationRequested);
}
let Some(resolved_source) = row.resolved_source.as_ref() else {
return rejected(MutationRejection::ResolvedSourceRequired);
};
if checkpoint.resolved_source_id != resolved_source.id {
return rejected(MutationRejection::CheckpointSourceMismatch);
}
let current = row
.checkpoint
.as_ref()
.and_then(CheckpointProjection::reusable);
if current.is_some_and(|current| {
checkpoint.validated_bytes < current.validated_bytes
|| checkpoint.validated_members < current.validated_members
}) {
return rejected(MutationRejection::CheckpointRegression);
}
if current == Some(&checkpoint) {
return accepted();
}
let now = OffsetDateTime::now_utc();
sqlx::query(
"UPDATE jobs SET checkpoint = $2, revision = revision + 1,
updated_at = $3 WHERE job_id = $1",
)
.bind(authority.job_id.as_str())
.bind(Json(&CheckpointProjection::Reusable {
checkpoint: checkpoint.clone(),
}))
.bind(now)
.execute(tx.as_mut())
.await?;
enqueue(tx, "job.updated", json!({ "job_id": authority.job_id })).await?;
accepted()
})
},
)
.await
}
pub async fn report_progress(
&self,
authority: &AttemptAuthority,
operation_id: &OpaqueId,
progress: ProgressRecord,
) -> Result<AttemptMutationOutcome, AttemptError> {
validate_progress(progress)?;
let coordination = self.coordination.clone();
self.execute_durable_mutation(
authority,
operation_id,
"report_progress",
&progress,
move |tx, authority| {
Box::pin(async move {
let Some(row) = lock_executing(tx, &authority).await? else {
return rejected(MutationRejection::AuthorityLost);
};
if row.cancel_requested {
return rejected(MutationRejection::CancellationRequested);
}
let owner = lease_owner(&authority).map_err(DurableError::effect)?;
let result = coordination
.report_progress_value(
authority.job_id.as_str(),
&owner,
ProgressValue {
completed_bytes: progress.completed_bytes,
total_bytes: progress.total_bytes,
completed_members: progress.completed_members,
total_members: progress.total_members,
},
)
.await
.map_err(DurableError::effect)?;
match result.code {
OpCode::Ok | OpCode::OkIdempotent => accepted(),
OpCode::FailStale => rejected(MutationRejection::ProgressRegression),
_ => rejected(MutationRejection::AuthorityLost),
}
})
},
)
.await
}
pub async fn publish_success(
&self,
authority: &AttemptAuthority,
operation_id: &OpaqueId,
result: PublicationInput,
) -> Result<AttemptMutationOutcome, AttemptError> {
let request = PublicationFingerprint::from(&result);
self.execute_durable_mutation(
authority,
operation_id,
"publish_success",
&request,
move |tx, authority| {
Box::pin(async move {
let Some(row) = lock_executing(tx, &authority).await? else {
return rejected(MutationRejection::AuthorityLost);
};
if row.cancel_requested {
return rejected(MutationRejection::CancellationRequested);
}
if result.attempt_id != authority.attempt_id
|| result.manifest.identity.target_store_id != row.target_store
|| result.manifest.identity.bucket != row.target_bucket
|| !sealed_result_matches(tx, &result).await?
{
return rejected(MutationRejection::InvalidResult);
}
let now = OffsetDateTime::now_utc();
let stored = publication_json(&result);
let complete_checkpoint = CheckpointProjection::Complete {
validated_bytes: result.total_bytes,
validated_members: result.member_count,
};
let changed = sqlx::query(
"UPDATE jobs SET phase = 'succeeded', authority_attempt_id = NULL,
checkpoint = $2, committed_result = $3, terminal_at = $4,
revision = revision + 1, updated_at = $4
WHERE job_id = $1 AND phase = 'running' AND cancel_requested = FALSE",
)
.bind(authority.job_id.as_str())
.bind(Json(&complete_checkpoint))
.bind(stored)
.bind(now)
.execute(tx.as_mut())
.await?;
if changed.rows_affected() != 1 {
return rejected(MutationRejection::RequiredState);
}
sqlx::query(
"UPDATE attempts SET state = 'committed', committed_at = $2
WHERE attempt_id = $1 AND state = 'executing'",
)
.bind(authority.attempt_id.as_str())
.bind(now)
.execute(tx.as_mut())
.await?;
enqueue(tx, "job.updated", json!({ "job_id": authority.job_id })).await?;
accepted()
})
},
)
.await
}
pub async fn publish_failure(
&self,
authority: &AttemptAuthority,
operation_id: &OpaqueId,
class: RuntimeFailureClass,
) -> Result<AttemptMutationOutcome, AttemptError> {
let max_attempts = self.config.max_attempts;
self.execute_durable_mutation(
authority,
operation_id,
"publish_failure",
&class,
move |tx, authority| {
Box::pin(async move {
let Some(row) = lock_executing(tx, &authority).await? else {
return rejected(MutationRejection::AuthorityLost);
};
if row.cancel_requested {
return rejected(MutationRejection::CancellationRequested);
}
let disposition = class.disposition();
let retry = disposition == FailureDisposition::Retryable
&& authority.fence < max_attempts;
let failure = FailureRecord { class, disposition };
let now = OffsetDateTime::now_utc();
let changed = if retry {
sqlx::query(
"UPDATE jobs SET phase = 'retry_wait', authority_attempt_id = NULL,
dispatch_needed = FALSE, revision = revision + 1, updated_at = $2
WHERE job_id = $1 AND phase = 'running' AND cancel_requested = FALSE",
)
.bind(authority.job_id.as_str())
.bind(now)
.execute(tx.as_mut())
.await?
} else {
sqlx::query(
"UPDATE jobs SET phase = 'failed', authority_attempt_id = NULL,
dispatch_needed = FALSE, failure = $2, terminal_at = $3,
revision = revision + 1, updated_at = $3
WHERE job_id = $1 AND phase = 'running' AND cancel_requested = FALSE",
)
.bind(authority.job_id.as_str())
.bind(Json(&failure))
.bind(now)
.execute(tx.as_mut())
.await?
};
if changed.rows_affected() != 1 {
return rejected(MutationRejection::RequiredState);
}
sqlx::query(
"UPDATE attempts SET state = 'stopped', stopped_at = $2, failure = $3
WHERE attempt_id = $1 AND state = 'executing'",
)
.bind(authority.attempt_id.as_str())
.bind(now)
.bind(Json(&failure))
.execute(tx.as_mut())
.await?;
enqueue(
tx,
if retry {
"job.retry_wait"
} else {
"job.updated"
},
json!({ "job_id": authority.job_id }),
)
.await?;
accepted()
})
},
)
.await
}
pub async fn mutation_projection(
&self,
job_id: &OpaqueId,
) -> Result<Option<JobMutationProjection>, AttemptError> {
let row = sqlx::query_as::<_, ProjectionRow>(
"SELECT phase, revision, authority_attempt_id, resolved_source, checkpoint,
committed_result, failure FROM jobs WHERE job_id = $1",
)
.bind(job_id.as_str())
.fetch_optional(&self.pool)
.await
.map_err(DurableError::from)?;
row.map(ProjectionRow::try_into_projection).transpose()
}
async fn execute_durable_mutation<T, D>(
&self,
authority: &AttemptAuthority,
operation_id: &OpaqueId,
kind: &'static str,
request: &T,
decide: D,
) -> Result<AttemptMutationOutcome, AttemptError>
where
T: Serialize,
D: for<'c> FnOnce(
&'c mut remora_durable::PgTx<'_>,
AttemptAuthority,
) -> remora_durable::BoxFuture<
'c,
Result<(MutationStatus, Value), DurableError>,
> + Send
+ 'static,
{
validate_authority(authority)?;
let request_fingerprint =
fingerprint(request).map_err(|error| AttemptError::Invalid(error.to_string()))?;
let eligibility = authority_binding(authority);
let authority = authority.clone();
let outcome = execute_mutation(
&self.pool,
MutationScope {
subject: &self.operation_subject,
operation: "attempt.mutation",
key: operation_id.as_str(),
},
kind,
&eligibility,
request_fingerprint,
move |tx| decide(tx, authority),
)
.await?;
mutation_outcome(outcome)
}
}
struct LockedAttempt {
cancel_requested: bool,
target_store: String,
target_bucket: String,
resolved_source: Option<DurableDescriptor>,
checkpoint: Option<CheckpointProjection>,
}
async fn lock_executing(
tx: &mut remora_durable::PgTx<'_>,
authority: &AttemptAuthority,
) -> Result<Option<LockedAttempt>, DurableError> {
let row = sqlx::query_as::<
_,
(
bool,
String,
String,
Option<Json<DurableDescriptor>>,
Option<Json<CheckpointProjection>>,
),
>(
"SELECT j.cancel_requested, j.target_store, j.target_bucket,
j.resolved_source, j.checkpoint
FROM jobs j JOIN attempts a ON a.attempt_id = j.authority_attempt_id
WHERE j.job_id = $1 AND j.phase = 'running'
AND j.current_fence = $2 AND j.authority_attempt_id = $3
AND a.worker_incarnation = $4 AND a.state = 'executing'
FOR UPDATE OF j, a",
)
.bind(authority.job_id.as_str())
.bind(to_i64(authority.fence)?)
.bind(authority.attempt_id.as_str())
.bind(authority.worker_incarnation.as_str())
.fetch_optional(tx.as_mut())
.await?;
Ok(row.map(
|(cancel_requested, target_store, target_bucket, resolved_source, checkpoint)| {
LockedAttempt {
cancel_requested,
target_store,
target_bucket,
resolved_source: resolved_source.map(|value| value.0),
checkpoint: checkpoint.map(|value| value.0),
}
},
))
}
fn accepted() -> Result<(MutationStatus, Value), DurableError> {
Ok((MutationStatus::Accepted, json!({ "accepted": true })))
}
fn rejected(reason: MutationRejection) -> Result<(MutationStatus, Value), DurableError> {
Ok((MutationStatus::Rejected, json!({ "reason": reason })))
}
fn mutation_outcome(outcome: MutationOutcome) -> Result<AttemptMutationOutcome, AttemptError> {
if outcome.disposition == MutationDisposition::Conflict {
return Err(AttemptError::OperationConflict);
}
if outcome.status == MutationStatus::Accepted {
return Ok(AttemptMutationOutcome::Accepted(outcome.disposition));
}
let reason = serde_json::from_value(
outcome
.response
.get("reason")
.cloned()
.ok_or_else(|| AttemptError::Invalid("missing mutation rejection".into()))?,
)
.map_err(|error| AttemptError::Invalid(error.to_string()))?;
Ok(AttemptMutationOutcome::Rejected {
reason,
disposition: outcome.disposition,
})
}
fn validate_descriptor(descriptor: &DurableDescriptor) -> Result<(), AttemptError> {
if descriptor.schema_version == 0
|| u64::from(descriptor.schema_version) > MAX_SAFE_INTEGER
|| descriptor.byte_length > MAX_SAFE_INTEGER
|| descriptor
.item_count
.is_some_and(|value| value > MAX_SAFE_INTEGER)
|| descriptor.checksum.len() != 71
|| !descriptor.checksum.starts_with("sha256:")
|| !descriptor.checksum.as_bytes()[7..]
.iter()
.copied()
.all(|value| value.is_ascii_digit() || (b'a'..=b'f').contains(&value))
{
return Err(AttemptError::Invalid(
"descriptor metadata is not canonical".into(),
));
}
Ok(())
}
fn validate_checkpoint(checkpoint: &CheckpointRecord) -> Result<(), AttemptError> {
validate_descriptor(&checkpoint.descriptor)?;
if (checkpoint.validated_bytes == 0 && checkpoint.validated_members == 0)
|| checkpoint.validated_bytes > MAX_SAFE_INTEGER
|| checkpoint.validated_members > MAX_SAFE_INTEGER
{
return Err(AttemptError::Invalid(
"checkpoint exceeds the safe-integer range".into(),
));
}
Ok(())
}
fn validate_progress(progress: ProgressRecord) -> Result<(), AttemptError> {
ProgressValue {
completed_bytes: progress.completed_bytes,
total_bytes: progress.total_bytes,
completed_members: progress.completed_members,
total_members: progress.total_members,
}
.validate()?;
Ok(())
}
fn validate_authority(authority: &AttemptAuthority) -> Result<(), AttemptError> {
if authority.fence == 0 || authority.fence > MAX_SAFE_INTEGER {
return Err(AttemptError::Invalid("invalid fencing token".into()));
}
Ok(())
}
fn authority_binding(authority: &AttemptAuthority) -> Vec<u8> {
format!(
"job={}|attempt={}|fence={}|worker={}",
authority.job_id, authority.attempt_id, authority.fence, authority.worker_incarnation
)
.into_bytes()
}
fn lease_owner(authority: &AttemptAuthority) -> Result<LeaseOwner, AttemptError> {
LeaseOwner::new(
authority.attempt_id.as_str(),
authority.fence,
authority.worker_incarnation.as_str(),
)
.map_err(Into::into)
}
fn to_i64(value: u64) -> Result<i64, DurableError> {
i64::try_from(value).map_err(DurableError::effect)
}
#[derive(Serialize)]
struct PublicationFingerprint {
attempt_id: OpaqueId,
manifest_id: OpaqueId,
schema_version: u32,
store: String,
bucket: String,
key: String,
version_id: Option<String>,
sha256: String,
size: u64,
member_count: u64,
total_bytes: u64,
}
impl From<&PublicationInput> for PublicationFingerprint {
fn from(value: &PublicationInput) -> Self {
Self {
attempt_id: value.attempt_id.clone(),
manifest_id: value.manifest_id.clone(),
schema_version: value.schema_version,
store: value.manifest.identity.target_store_id.clone(),
bucket: value.manifest.identity.bucket.clone(),
key: value.manifest.identity.key.clone(),
version_id: value.manifest.identity.version_id.clone(),
sha256: value.manifest.content_sha256.as_str().into(),
size: value.manifest.size,
member_count: value.member_count,
total_bytes: value.total_bytes,
}
}
}
async fn sealed_result_matches(
tx: &mut remora_durable::PgTx<'_>,
result: &PublicationInput,
) -> Result<bool, DurableError> {
let matches: bool = sqlx::query_scalar(
"SELECT EXISTS (
SELECT 1 FROM result_inventories
WHERE attempt_id = $1 AND state = 'sealed'
AND manifest_schema_version = $2 AND manifest_id = $3
AND manifest_store = $4 AND manifest_bucket = $5 AND manifest_key = $6
AND manifest_version_id IS NOT DISTINCT FROM $7
AND manifest_sha256 = $8 AND manifest_size = $9
AND member_count = $10 AND total_bytes = $11
)",
)
.bind(result.attempt_id.as_str())
.bind(i32::try_from(result.schema_version).map_err(DurableError::effect)?)
.bind(result.manifest_id.as_str())
.bind(&result.manifest.identity.target_store_id)
.bind(&result.manifest.identity.bucket)
.bind(&result.manifest.identity.key)
.bind(&result.manifest.identity.version_id)
.bind(result.manifest.content_sha256.as_str())
.bind(to_i64(result.manifest.size)?)
.bind(to_i64(result.member_count)?)
.bind(to_i64(result.total_bytes)?)
.fetch_one(tx.as_mut())
.await?;
Ok(matches)
}
fn publication_json(result: &PublicationInput) -> Value {
serde_json::to_value(CommittedResultRecord::from(result))
.expect("committed result serialization cannot fail")
}
#[derive(sqlx::FromRow)]
struct ProjectionRow {
phase: String,
revision: i64,
authority_attempt_id: Option<String>,
resolved_source: Option<Json<DurableDescriptor>>,
checkpoint: Option<Json<CheckpointProjection>>,
committed_result: Option<Value>,
failure: Option<Json<FailureRecord>>,
}
impl ProjectionRow {
fn try_into_projection(self) -> Result<JobMutationProjection, AttemptError> {
Ok(JobMutationProjection {
phase: parse_phase(&self.phase)?,
revision: u64::try_from(self.revision)
.map_err(|_| AttemptError::Invalid("negative job revision".into()))?,
authority_attempt_id: self
.authority_attempt_id
.map(OpaqueId::parse)
.transpose()
.map_err(|error| AttemptError::Invalid(error.to_string()))?,
resolved_source: self.resolved_source.map(|value| value.0),
checkpoint: self.checkpoint.map(|value| value.0),
committed_result: self
.committed_result
.map(serde_json::from_value)
.transpose()
.map_err(|error| AttemptError::Invalid(error.to_string()))?,
failure: self.failure.map(|value| value.0),
})
}
}
fn parse_phase(value: &str) -> Result<JobPhase, AttemptError> {
match value {
"queued" => Ok(JobPhase::Queued),
"running" => Ok(JobPhase::Running),
"retry_wait" => Ok(JobPhase::RetryWait),
"cancelling" => Ok(JobPhase::Cancelling),
"succeeded" => Ok(JobPhase::Succeeded),
"failed" => Ok(JobPhase::Failed),
"cancelled" => Ok(JobPhase::Cancelled),
_ => Err(AttemptError::Invalid(format!(
"unknown job phase '{value}'"
))),
}
}

View file

@ -10,12 +10,13 @@ use remora_durable::{
};
use serde::Serialize;
use serde_json::json;
use sqlx::PgPool;
use sqlx::{PgPool, types::Json};
use time::OffsetDateTime;
use crate::{
ActivationOutcome, AttemptAuthority, AttemptError, AttemptFaultInjector, AttemptFaultPoint,
AttemptState, ClaimOutcome, ClaimRejection, RecoveryOutcome, RenewalOutcome,
AttemptState, CheckpointProjection, ClaimOutcome, ClaimRejection, RecoveryOutcome,
RenewalOutcome,
};
struct NoFaults;
@ -41,12 +42,12 @@ impl Default for AttemptConfig {
#[derive(Clone)]
pub struct AttemptService {
pool: PgPool,
coordination: CoordinationStore,
pub(crate) pool: PgPool,
pub(crate) coordination: CoordinationStore,
local_permits: LocalPermitGate,
operation_subject: OpaqueId,
pub(crate) operation_subject: OpaqueId,
faults: Arc<dyn AttemptFaultInjector>,
config: AttemptConfig,
pub(crate) config: AttemptConfig,
}
impl AttemptService {
@ -477,14 +478,26 @@ async fn authorize_attempt(
tx: &mut remora_durable::PgTx<'_>,
input: AuthorizeInput<'_>,
) -> Result<ClaimOutcome, DurableError> {
let row = sqlx::query_as::<_, (String, bool, i64, Option<String>)>(
"SELECT phase, dispatch_needed, current_fence, authority_attempt_id
let row = sqlx::query_as::<
_,
(
String,
bool,
i64,
Option<String>,
Option<Json<crate::DurableDescriptor>>,
Option<Json<CheckpointProjection>>,
),
>(
"SELECT phase, dispatch_needed, current_fence, authority_attempt_id,
resolved_source, checkpoint
FROM jobs WHERE job_id = $1 FOR UPDATE",
)
.bind(input.job_id.as_str())
.fetch_optional(tx.as_mut())
.await?;
let Some((phase, dispatch_needed, current_fence, authority)) = row else {
let Some((phase, dispatch_needed, current_fence, authority, resolved_source, checkpoint)) = row
else {
return Ok(claim_rejected(ClaimRejection::JobUnavailable));
};
if phase != "queued" || !dispatch_needed || authority.is_some() {
@ -509,17 +522,29 @@ async fn authorize_attempt(
input.reserved.store(true, Ordering::Release);
input.faults.hit(AttemptFaultPoint::ClaimAfterReserve);
let fence = current_fence + 1;
let initial_progress = match (resolved_source, checkpoint) {
(Some(source), Some(checkpoint))
if checkpoint
.0
.reusable()
.is_some_and(|value| value.resolved_source_id == source.0.id) =>
{
checkpoint.0.reusable().unwrap().validated_bytes
}
_ => 0,
};
let now = OffsetDateTime::now_utc();
sqlx::query(
"INSERT INTO attempts (
attempt_id, job_id, fence, worker_incarnation, state,
initial_progress, authorized_at, executing_at, reaped_at
) VALUES ($1, $2, $3, $4, 'authorized', 0, $5, NULL, NULL)",
) VALUES ($1, $2, $3, $4, 'authorized', $5, $6, NULL, NULL)",
)
.bind(input.attempt_id.as_str())
.bind(input.job_id.as_str())
.bind(i64::try_from(fence).map_err(DurableError::effect)?)
.bind(input.worker.as_str())
.bind(i64::try_from(initial_progress).map_err(DurableError::effect)?)
.bind(now)
.execute(tx.as_mut())
.await?;

View file

@ -27,6 +27,8 @@ pub enum AttemptState {
Authorized,
Executing,
Reaped,
Stopped,
Committed,
}
impl AttemptState {
@ -35,6 +37,8 @@ impl AttemptState {
"authorized" => Self::Authorized,
"executing" => Self::Executing,
"reaped" => Self::Reaped,
"stopped" => Self::Stopped,
"committed" => Self::Committed,
_ => return None,
})
}