clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 06:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

codex: address PR review feedback (#17581)

Browse Source
This commit is contained in:
Eric Traut
2026-04-12 17:00:38 -07:00
parent 09b222272b
commit 75b389665a
1 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
codex-rs/state/src/runtime/timers.rs
View File

@@ -166,6 +166,7 @@ ORDER BY created_at ASC, id ASC
&self,
thread_id: &str,
id: &str,
due_at: i64,
next_run_at: Option<i64>,
) -> anyhow::Result<bool> {
let result = sqlx::query(
@@ -175,11 +176,15 @@ SET pending_run = 1,
next_run_at = ?
WHERE thread_id = ?
AND id = ?
AND pending_run = 0
AND next_run_at IS NOT NULL
AND next_run_at <= ?
"#,
)
.bind(next_run_at)
.bind(thread_id)
.bind(id)
.bind(due_at)
.execute(self.pool.as_ref())
.await?;
Ok(result.rows_affected() > 0)
@@ -272,6 +277,7 @@ WHERE thread_id = ?
mod tests {
use super::StateRuntime;
use super::test_support::unique_temp_dir;
use crate::ThreadTimer;
use crate::ThreadTimerCreateParams;
use crate::ThreadTimerUpdateParams;
use pretty_assertions::assert_eq;
@@ -609,6 +615,65 @@ ORDER BY name
assert!(!timers[0].pending_run);
}
#[tokio::test]
async fn due_update_rejects_stale_timer_row_after_claim() {
let runtime = test_runtime().await;
let mut params = timer_params("timer-1", "thread-1");
params.next_run_at = Some(110);
params.pending_run = false;
runtime
.create_thread_timer(&params)
.await
.expect("create overdue recurring timer");
let update = ThreadTimerUpdateParams {
trigger_json: params.trigger_json.clone(),
content: params.content.clone(),
instructions: params.instructions.clone(),
meta_json: params.meta_json.clone(),
delivery: params.delivery.clone(),
next_run_at: Some(120),
last_run_at: Some(110),
pending_run: false,
};
assert!(
runtime
.claim_recurring_thread_timer(
"thread-1", "timer-1", /*due_at*/ 110, /*expected_last_run_at*/ None,
&update,
)
.await
.expect("claim overdue recurring timer")
);
assert!(
!runtime
.update_thread_timer_due("thread-1", "timer-1", /*due_at*/ 110, Some(130))
.await
.expect("stale due update should be rejected")
);
assert_eq!(
runtime
.list_thread_timers("thread-1")
.await
.expect("list timers"),
vec![ThreadTimer {
id: params.id,
thread_id: params.thread_id,
source: params.source,
client_id: params.client_id,
trigger_json: params.trigger_json,
content: params.content,
instructions: params.instructions,
meta_json: params.meta_json,
delivery: params.delivery,
created_at: params.created_at,
next_run_at: Some(120),
last_run_at: Some(110),
pending_run: false,
}]
);
}
#[tokio::test]
async fn recurring_idle_claim_rejects_stale_last_run_at_even_when_pending_stays_true() {
let runtime = test_runtime().await;