Fix job_id mismatch between ingestion enqueue and status endpoints
CI / lint (push) Canceled after 0s
CI / typecheck (push) Canceled after 0s
CI / unit-tests (push) Canceled after 0s
CI / integration-tests (push) Canceled after 0s
CI / container-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / lint (push) Canceled after 0s
CI / typecheck (push) Canceled after 0s
CI / unit-tests (push) Canceled after 0s
CI / integration-tests (push) Canceled after 0s
CI / container-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
POST /api/v1/admin/ingest/movie returned arq's own internal queue
job id, but GET /api/v1/admin/ingest/jobs/{job_id} looked up our
IngestionJob DB row by its own UUID -- a completely different id that
didn't even exist yet at enqueue time (the row was only created once
the worker picked up the task). Every status poll 404'd.
Fix: create the IngestionJob row synchronously in the enqueue endpoint
(reusing the existing idempotency-key logic, so repeat enqueues for
the same tmdb_id reuse the same row rather than creating duplicates),
pass its real id into the arq task, and have the worker update that
row instead of creating a new one.
Found by actually running the milestone end-to-end: enqueue a real
TMDb ingestion, then poll its status.
Co-Authored-By: Claude Sonnet 5 <[email protected]>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
dd6ecce78d
commit
669034896a
+13
-6
@@ -17,6 +17,7 @@ from app.core.database import get_db
|
||||
from app.core.queue import get_queue
|
||||
from app.core.security import require_admin_api_key
|
||||
from app.repositories.provider_repository import get_ingestion_job
|
||||
from app.services.ingestion.runner import get_or_create_ingestion_job
|
||||
|
||||
router = APIRouter(
|
||||
prefix="/admin",
|
||||
@@ -54,24 +55,30 @@ class IngestionJobOut(BaseModel):
|
||||
async def enqueue_movie_ingestion(
|
||||
body: IngestMovieRequest, queue: ArqRedis = Depends(get_queue)
|
||||
) -> IngestionEnqueuedOut:
|
||||
job = await queue.enqueue_job("ingest_movie_task", body.tmdb_id)
|
||||
if job is None:
|
||||
# Created synchronously (and idempotently — same tmdb_id reuses the same
|
||||
# row) so the response's job_id is immediately valid against
|
||||
# GET /ingest/jobs/{job_id}. arq's own job id is a separate, unrelated
|
||||
# identifier used only for queue bookkeeping.
|
||||
job_id = await get_or_create_ingestion_job("movie_sync", "movie", body.tmdb_id)
|
||||
arq_job = await queue.enqueue_job("ingest_movie_task", str(job_id), body.tmdb_id)
|
||||
if arq_job is None:
|
||||
raise HTTPException(
|
||||
status.HTTP_503_SERVICE_UNAVAILABLE, "Could not enqueue ingestion job (queue busy)."
|
||||
)
|
||||
return IngestionEnqueuedOut(job_id=job.job_id, arq_job_id=job.job_id)
|
||||
return IngestionEnqueuedOut(job_id=str(job_id), arq_job_id=arq_job.job_id)
|
||||
|
||||
|
||||
@router.post("/ingest/person", response_model=IngestionEnqueuedOut)
|
||||
async def enqueue_person_ingestion(
|
||||
body: IngestPersonRequest, queue: ArqRedis = Depends(get_queue)
|
||||
) -> IngestionEnqueuedOut:
|
||||
job = await queue.enqueue_job("ingest_person_task", body.tmdb_id)
|
||||
if job is None:
|
||||
job_id = await get_or_create_ingestion_job("person_sync", "person", body.tmdb_id)
|
||||
arq_job = await queue.enqueue_job("ingest_person_task", str(job_id), body.tmdb_id)
|
||||
if arq_job is None:
|
||||
raise HTTPException(
|
||||
status.HTTP_503_SERVICE_UNAVAILABLE, "Could not enqueue ingestion job (queue busy)."
|
||||
)
|
||||
return IngestionEnqueuedOut(job_id=job.job_id, arq_job_id=job.job_id)
|
||||
return IngestionEnqueuedOut(job_id=str(job_id), arq_job_id=arq_job.job_id)
|
||||
|
||||
|
||||
@router.get("/ingest/jobs/{job_id}", response_model=IngestionJobOut)
|
||||
|
||||
Reference in New Issue
Block a user