Add stuck running job recovery with lease timeout
This commit is contained in:
@@ -95,7 +95,8 @@ def enqueue_job(
|
||||
return job
|
||||
|
||||
|
||||
def claim_next_job(session: Session) -> ReviewJob | None:
|
||||
def claim_next_job(session: Session, *, lease_timeout_seconds: int, stuck_job_recovery_action: str) -> ReviewJob | None:
|
||||
recover_stuck_jobs(session, lease_timeout_seconds=lease_timeout_seconds, action=stuck_job_recovery_action)
|
||||
job = session.execute(
|
||||
select(ReviewJob).where(ReviewJob.status == JobStatus.queued).order_by(ReviewJob.created_at.asc()).limit(1).with_for_update(skip_locked=True)
|
||||
).scalar_one_or_none()
|
||||
@@ -120,6 +121,43 @@ def claim_next_job(session: Session) -> ReviewJob | None:
|
||||
return job
|
||||
|
||||
|
||||
def recover_stuck_jobs(session: Session, *, lease_timeout_seconds: int, action: str) -> int:
|
||||
if lease_timeout_seconds <= 0:
|
||||
return 0
|
||||
now = datetime.now(timezone.utc)
|
||||
cutoff = now - timedelta(seconds=lease_timeout_seconds)
|
||||
stale_jobs = session.execute(
|
||||
select(ReviewJob)
|
||||
.where(
|
||||
ReviewJob.status == JobStatus.running,
|
||||
ReviewJob.started_at.is_not(None),
|
||||
ReviewJob.started_at < cutoff,
|
||||
)
|
||||
.order_by(ReviewJob.started_at.asc())
|
||||
.with_for_update(skip_locked=True)
|
||||
).scalars()
|
||||
recovered = 0
|
||||
for job in stale_jobs:
|
||||
recovered += 1
|
||||
message = f"Job lease timed out after {lease_timeout_seconds}s while in running state; recovered via action={action}."
|
||||
latest_run = (
|
||||
session.execute(select(ReviewRun).where(ReviewRun.job_id == job.id).order_by(ReviewRun.id.desc()).limit(1)).scalar_one_or_none()
|
||||
)
|
||||
if latest_run and latest_run.status == RunStatus.running:
|
||||
latest_run.status = RunStatus.failed
|
||||
latest_run.finished_at = now
|
||||
latest_run.error_message = message
|
||||
job.last_error = message
|
||||
if action == "fail":
|
||||
job.status = JobStatus.failed
|
||||
job.finished_at = now
|
||||
else:
|
||||
job.status = JobStatus.queued
|
||||
job.started_at = None
|
||||
job.finished_at = None
|
||||
return recovered
|
||||
|
||||
|
||||
def finish_job(
|
||||
session: Session,
|
||||
*,
|
||||
|
||||
Reference in New Issue
Block a user