Private
Public Access
Isolate unexpected fetch failures and harden task durability (T2)
fetch_feed had no time limit and no handling for anything beyond the network/parse errors fetch_and_ingest already catches internally — an unexpected exception (a parser/sanitizer bug, a DB error) crashed the task with no error recorded on the Feed, the claim left held for the full CLAIM_STALE_MINUTES, and no visibility beyond a bare traceback. fetch_feed now catches that, records it the same way a handled failure would be (reusing fetcher.record_fetch_error, promoted from a private helper), clears the claim, and re-raises so Celery still marks the task FAILED. soft_time_limit/time_limit bound a single fetch that somehow outruns FETCH_TIMEOUT_SECONDS + ssrf_guard's response cap during parsing/ingestion. Also: a worker process killed mid-task (OOM, deploy restart, crash) previously lost that task silently — Celery's default is to ack a message the moment a worker *starts* it. CELERY_TASK_ACKS_LATE + CELERY_TASK_REJECT_ON_WORKER_LOST (config/settings/base.py) make the message redeliverable instead, and CELERY_WORKER_PREFETCH_MULTIPLIER=1 keeps a worker from grabbing a batch of tasks it could lose all at once. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
0466ccc334
commit
64f25789f5
4 files changed
+104
-10
No files matched your search
+32
-3
@@ -11,7 +11,7 @@ from apps.articles.tasks import apply_filter_rules_for_feed
|
||||
|
||||
from .models import Feed
|
||||
from .opml import import_opml
|
||||
from .services.fetcher import effective_interval_minutes, fetch_and_ingest
|
||||
from .services.fetcher import effective_interval_minutes, fetch_and_ingest, record_fetch_error
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -64,14 +64,43 @@ def _is_due(feed: Feed) -> bool:
|
||||
return feed.last_fetched_at <= timezone.now() - timedelta(minutes=interval)
|
||||
|
||||
|
||||
@shared_task
|
||||
# Bounds a single feed's fetch+parse+ingest, independent of
|
||||
# FETCH_TIMEOUT_SECONDS (apps.feeds.services.fetcher) which only covers
|
||||
# the HTTP request itself: parsing/sanitizing/writing a large-but-under-
|
||||
# the-byte-cap feed could still run long. soft_time_limit lets the
|
||||
# except-Exception handler below record a normal feed error (and clear
|
||||
# the claim) before the hard time_limit kills the worker process outright.
|
||||
FETCH_FEED_SOFT_TIME_LIMIT = 60
|
||||
FETCH_FEED_TIME_LIMIT = 90
|
||||
|
||||
|
||||
@shared_task(time_limit=FETCH_FEED_TIME_LIMIT, soft_time_limit=FETCH_FEED_SOFT_TIME_LIMIT)
|
||||
def fetch_feed(feed_id: int):
|
||||
try:
|
||||
feed = Feed.objects.get(pk=feed_id, is_active=True)
|
||||
except Feed.DoesNotExist:
|
||||
return None
|
||||
|
||||
result = fetch_and_ingest(feed)
|
||||
try:
|
||||
result = fetch_and_ingest(feed)
|
||||
except Exception:
|
||||
# fetch_and_ingest already handles the expected failure modes
|
||||
# (network errors, SSRF-blocked targets, unparseable feeds) by
|
||||
# returning an error FetchResult rather than raising — anything
|
||||
# that reaches here is unexpected (a parser/sanitizer bug, a DB
|
||||
# error, this task's own soft time limit), so it's recorded the
|
||||
# same way a handled failure would be rather than silently
|
||||
# leaving the feed's status stale, the claim held for the full
|
||||
# CLAIM_STALE_MINUTES, and no record of what happened. Re-raised
|
||||
# afterward so Celery still marks the task FAILED (visible in
|
||||
# worker logs/monitoring) instead of swallowing it.
|
||||
logger.exception("Feed %s: unexpected error during fetch", feed.feed_url)
|
||||
record_fetch_error(feed, "Unexpected error — see worker logs")
|
||||
feed.last_fetched_at = timezone.now()
|
||||
feed.claimed_at = None
|
||||
feed.save()
|
||||
raise
|
||||
|
||||
feed.claimed_at = None
|
||||
feed.save()
|
||||
|
||||
|
||||
Reference in new issue
Block a user