feat(gpu): fast orphan recovery — graceful release + 60s sweep (#114)
So work an agent orphaned gets picked back up quickly, three layers: - GpuJobService.release(): a graceful agent stop hands its still-leased jobs back to pending instantly (POST /api/gpu/jobs/release), no waiting out the lease. - GpuJobService.recover_orphaned() + recover_orphaned_gpu_jobs Celery task on a 60s beat: resets expired leases (a hard-crashed agent) to pending and keeps the queue counts honest even when nothing is leasing. - Lease TTL 300→180s: still well above any single job (a capped-frame video embed is tens of seconds, and a live worker heartbeats), but a hard crash recovers faster once the sweep fires. Tests: release returns-to-pending (token-scoped), recover_orphaned resets only expired leases, release API round-trip. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Ttrj5P7upUTueSfoJcxEqa
This commit is contained in:
@@ -1,10 +1,13 @@
|
||||
"""GPU-job queue engine (#114): enqueue / lease / heartbeat / complete / fail.
|
||||
"""GPU-job queue engine (#114): enqueue / lease / heartbeat / complete / fail
|
||||
/ release / recover_orphaned.
|
||||
|
||||
Backs the HTTP API the desktop agent pulls work from. The lease claims pending
|
||||
OR expired-leased jobs with FOR UPDATE SKIP LOCKED, so concurrent agents (or a
|
||||
retry after an agent died) never grab the same job and the queue self-heals
|
||||
without a separate recovery sweep. Result-writing (regions) is done by the API
|
||||
handler via RegionService; complete() just closes the job.
|
||||
OR expired-leased jobs with FOR UPDATE SKIP LOCKED, so concurrent agents/workers
|
||||
never grab the same job. Orphan recovery is three-layered: a graceful agent stop
|
||||
calls release() to hand its in-flight jobs back instantly; a hard crash is caught
|
||||
by recover_orphaned() (a 60s beat sweep) which resets expired leases to pending;
|
||||
and the lease itself reclaims expired leases as a final backstop. Result-writing
|
||||
(regions) is done by the API handler via RegionService; complete() just closes.
|
||||
"""
|
||||
|
||||
from datetime import UTC, datetime, timedelta
|
||||
@@ -14,7 +17,10 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from ...models import GpuJob
|
||||
|
||||
DEFAULT_LEASE_TTL = 300 # seconds an agent holds a job before it can be re-leased
|
||||
# Lease window. Kept comfortably above any single job (a capped-frame video embed
|
||||
# is tens of seconds) so a live, heartbeating worker is never falsely expired,
|
||||
# but short enough that a hard crash recovers fast once the sweep fires.
|
||||
DEFAULT_LEASE_TTL = 180 # seconds an agent holds a job before it can be re-leased
|
||||
DEFAULT_BATCH = 8
|
||||
MAX_ATTEMPTS = 3
|
||||
|
||||
@@ -132,3 +138,40 @@ class GpuJobService:
|
||||
job.error = (error or "")[:1000]
|
||||
job.updated_at = datetime.now(UTC)
|
||||
return True
|
||||
|
||||
async def release(self, token: str, job_ids: list[int]) -> int:
|
||||
"""Hand the agent's still-leased jobs back to pending NOW (graceful stop),
|
||||
so another worker picks them up immediately instead of waiting out the
|
||||
lease. Scoped to the token's own leases. Returns rows released."""
|
||||
if not job_ids:
|
||||
return 0
|
||||
now = datetime.now(UTC)
|
||||
res = await self.session.execute(
|
||||
update(GpuJob)
|
||||
.where(
|
||||
GpuJob.id.in_(job_ids),
|
||||
GpuJob.lease_token == token,
|
||||
GpuJob.status == "leased",
|
||||
)
|
||||
.values(
|
||||
status="pending", lease_token=None, leased_at=None,
|
||||
lease_expires_at=None, updated_at=now,
|
||||
)
|
||||
)
|
||||
return res.rowcount or 0
|
||||
|
||||
async def recover_orphaned(self) -> int:
|
||||
"""Reset every expired lease back to pending — catches agents that died
|
||||
mid-job (no graceful release). Run on a short beat so the queue recovers
|
||||
+ reads honestly even when no worker is actively leasing. Returns rows
|
||||
recovered."""
|
||||
now = datetime.now(UTC)
|
||||
res = await self.session.execute(
|
||||
update(GpuJob)
|
||||
.where(GpuJob.status == "leased", GpuJob.lease_expires_at < now)
|
||||
.values(
|
||||
status="pending", lease_token=None, leased_at=None,
|
||||
lease_expires_at=None, updated_at=now,
|
||||
)
|
||||
)
|
||||
return res.rowcount or 0
|
||||
|
||||
Reference in New Issue
Block a user