From dfade2ec664aa167df11a2ba29bc68d5826089f6 Mon Sep 17 00:00:00 2001 From: Oscar Nordstrom <13300531+n0rpan@users.noreply.github.com> Date: Wed, 18 Nov 2026 01:35:47 +0100 Subject: [PATCH] Reuse native task lock acquisition (#407) --- oxa/oxa-work/src/lib.rs | 24 +++--------------------- oxa/oxa-work/src/tree.rs | 2 +- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/oxa/oxa-work/src/lib.rs b/oxa/oxa-work/src/lib.rs index 3b8991ed..32344bc6 100644 --- a/oxa/oxa-work/src/lib.rs +++ b/oxa/oxa-work/src/lib.rs @@ -994,14 +994,14 @@ pub fn run_task_with_policy( .map_err(|e| e.to_string()) } -fn lock_task(policy: &RunPolicy, id: &str) -> Result { +fn lock_task(policy: &RunPolicy, id: &str, create: bool) -> Result { let lock_path = policy.storage.join(format!("{id}.lock")); let lock_file = fs::OpenOptions::new() .read(true) .write(true) .mode(0o600) .custom_flags(shadow::OWNER_FILE_FLAGS) - .create(true) + .create(create) .truncate(false) .open(&lock_path) .map_err(|e| format!("cannot lock task {id}: {e}"))?; @@ -1069,25 +1069,7 @@ impl<'a> LockedTask<'a> { .map_err(|error| format!("task storage: {error}"))?; } verify_task_storage(&policy.storage).map_err(|error| format!("task storage: {error}"))?; - let lock_path = policy.storage.join(format!("{}.lock", task.id)); - let lock = fs::OpenOptions::new() - .read(true) - .write(true) - .mode(0o600) - .custom_flags(shadow::OWNER_FILE_FLAGS) - .create(create) - .truncate(false) - .open(&lock_path) - .map_err(|e| format!("cannot lock task {}: {e}", task.id))?; - let lock_metadata = lock - .metadata() - .map_err(|e| format!("cannot inspect task lock: {e}"))?; - // SAFETY: geteuid has no preconditions and returns this process's effective owner. - if !shadow::regular_file_owned_by(&lock_metadata, unsafe { libc::geteuid() }) { - return Err("cannot lock task: lock must be an owner-controlled regular file".into()); - } - lock.try_lock() - .map_err(|e| format!("task {} is already running: {e}", task.id))?; + let lock = lock_task(policy, &task.id, create)?; Ok(Self { task, policy, lock }) } diff --git a/oxa/oxa-work/src/tree.rs b/oxa/oxa-work/src/tree.rs index 4f9cbff2..ce1fd0f1 100644 --- a/oxa/oxa-work/src/tree.rs +++ b/oxa/oxa-work/src/tree.rs @@ -307,7 +307,7 @@ fn release_review_branch( { return Err(blocked.into()); } - let prior_lock = lock_task(policy, prior_id)?; + let prior_lock = lock_task(policy, prior_id, true)?; let prior = load_task_checkpoint(policy, prior_id)?.ok_or(blocked)?; if prior.task.id != prior_id || prior.task.reviewed_head().is_none()