fix(ingest): address review round 1 (reclaim queue + tests)
- Register the periodic stalled-job reclaim on a dedicated ingest-maintenance queue that every worker drains (any --tier), so reclaim still fires when the fast fleet is scaled to zero and only ocr workers run. procrastinate's periodic-defer dedup keeps it single-run across drainers. - escalation: mark `unsupported`/`forced` reason labels as reserved (not raised). - processor: note that options/progress_callback are intentionally not threaded through _parse_pdf_tier yet (symmetric with the inline path). - tests: assert TieredEscalationStrategy backoff progression (4/8/16/…/300s); cover get_ingest_pending per-queue aggregation + the legacy job_counts fallback; add an external-path zero-page no-escalation case; use the canonical INGEST_QUEUE_FAST instead of the back-compat alias. Deck #323. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
9676bb3106
commit
35f8204a16
@@ -384,6 +384,7 @@ def worker(concurrency: int | None, tier: str | None):
|
||||
|
||||
from nextcloud_mcp_server.vector.queue.procrastinate import ( # noqa: PLC0415
|
||||
ALL_INGEST_QUEUES,
|
||||
INGEST_QUEUE_MAINTENANCE,
|
||||
LEGACY_INGEST_QUEUE,
|
||||
TIER_QUEUES,
|
||||
apply_ingest_queue_schema,
|
||||
@@ -392,11 +393,14 @@ def worker(concurrency: int | None, tier: str | None):
|
||||
|
||||
# Which queues this process drains. A single tier -> just its queue; no tier
|
||||
# -> every tier queue PLUS the legacy single queue, so a rolling upgrade
|
||||
# never strands jobs deferred under the pre-#323 name.
|
||||
# never strands jobs deferred under the pre-#323 name. Every worker also
|
||||
# drains the maintenance queue so the periodic stalled-job reclaim fires
|
||||
# regardless of which tier(s) are scaled up (procrastinate dedups the
|
||||
# periodic, so multiple drainers don't multiply the reclaim).
|
||||
if tier is not None:
|
||||
queues = [TIER_QUEUES[tier]]
|
||||
queues = [TIER_QUEUES[tier], INGEST_QUEUE_MAINTENANCE]
|
||||
else:
|
||||
queues = [*ALL_INGEST_QUEUES, LEGACY_INGEST_QUEUE]
|
||||
queues = [*ALL_INGEST_QUEUES, LEGACY_INGEST_QUEUE, INGEST_QUEUE_MAINTENANCE]
|
||||
|
||||
# This is the consumer side of the distributed (postgres) ingest backend.
|
||||
# Unlike the in-process anyio pool, the worker talks to procrastinate's App
|
||||
|
||||
@@ -53,8 +53,10 @@ class EscalateError(Exception):
|
||||
the junk text is never indexed, and it must never be swallowed by a broad
|
||||
``except Exception`` on the indexing path.
|
||||
|
||||
``reason`` uses the existing escalation label vocabulary:
|
||||
``empty_text`` | ``low_confidence`` | ``unsupported`` | ``forced``.
|
||||
``reason`` uses the existing escalation label vocabulary. This PR raises
|
||||
``empty_text`` (scanned / no text layer) and ``low_confidence`` (junk text
|
||||
layer); ``unsupported`` and ``forced`` are reserved for future callers and
|
||||
not raised yet.
|
||||
"""
|
||||
|
||||
def __init__(self, *, from_tier: str, to_tier: str, reason: str) -> None:
|
||||
|
||||
@@ -147,6 +147,10 @@ async def _parse_pdf_tier(
|
||||
EscalateError,
|
||||
)
|
||||
|
||||
# options / progress_callback are not threaded here -- the indexing caller
|
||||
# passes neither today, and the inline path (registry.process) omits them
|
||||
# too. Forward them if a tier processor ever needs per-call tuning (e.g. OCR
|
||||
# DPI); keeping the two paths symmetric until then.
|
||||
result = await registry.process_tier(content, content_type, filename, tier)
|
||||
if result.success:
|
||||
decision = registry.evaluate_escalation(
|
||||
|
||||
@@ -87,6 +87,14 @@ LEGACY_INGEST_QUEUE = "ingest"
|
||||
# Back-compat alias for callers that imported the old single-queue constant.
|
||||
INGEST_QUEUE_NAME = DEFAULT_INGEST_QUEUE
|
||||
|
||||
# Maintenance queue carrying ONLY the periodic stalled-job reclaim (no document
|
||||
# jobs). Every worker drains it regardless of --tier, so the reclaim fires even
|
||||
# in an asymmetric deployment where the fast fleet is scaled to zero and only
|
||||
# ocr workers run. procrastinate's periodic-defer dedup ensures exactly one
|
||||
# worker runs each tick even when many drain this queue. Kept off document
|
||||
# queues so tier isolation (which fleet processes which docs) is preserved.
|
||||
INGEST_QUEUE_MAINTENANCE = "ingest-maintenance"
|
||||
|
||||
# Queues the job-count + reclaim helpers sweep (tier queues + the legacy one).
|
||||
_MANAGED_QUEUES: tuple[str, ...] = (*ALL_INGEST_QUEUES, LEGACY_INGEST_QUEUE)
|
||||
|
||||
@@ -368,8 +376,12 @@ def _build_ingest_blueprint() -> Blueprint:
|
||||
max_transient_attempts=get_settings().ingest_transient_max_attempts
|
||||
),
|
||||
)(process_document_task)
|
||||
# Reclaim runs on the dedicated maintenance queue (every worker drains it),
|
||||
# not a tier queue -- otherwise an ocr-only deployment (fast scaled to zero)
|
||||
# would never fire the periodic and orphaned ``doing`` jobs would never be
|
||||
# reclaimed. The task itself sweeps ALL queues (get_stalled_jobs(queue=None)).
|
||||
reclaim = bp.task(
|
||||
name="reclaim_stalled_jobs", queue=DEFAULT_INGEST_QUEUE, pass_context=True
|
||||
name="reclaim_stalled_jobs", queue=INGEST_QUEUE_MAINTENANCE, pass_context=True
|
||||
)(reclaim_stalled_ingest_jobs)
|
||||
bp.periodic(cron="*/5 * * * *", periodic_id="reclaim_stalled_ingest")(reclaim)
|
||||
return bp
|
||||
|
||||
Reference in New Issue
Block a user