Private
Public Access
Push due-feed scheduling into an indexed DB query (C1)
poll_due_feeds loaded every active feed's timing fields and recomputed each one's error-backoff due-ness in Python on every beat tick (every 1-2 minutes) — scheduler CPU and DB reads grew linearly with total feed count regardless of how many were actually due. Feed.next_fetch_at (indexed together with is_active) is now set by fetch_feed itself right after every fetch attempt, success or error, using the same backoff formula that used to run per-feed in poll_due_feeds. The scheduler's query is now a direct indexed range scan (next_fetch_at <= now), ordered so the most overdue feeds claim first, and bounded to POLL_BATCH_SIZE so a large backlog spreads across several ticks instead of dispatching everything at once. A migration backfills next_fetch_at for existing feeds using the same formula. reset_feed_backoff also clears next_fetch_at so a manually-reset feed is immediately due again, matching its prior behavior. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
b84cfe6474
commit
b33fe905d2
6 files changed
+186
-50
No files matched your search
@@ -12,18 +12,23 @@ from apps.feeds.tasks import fetch_feed, poll_due_feeds
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_poll_due_feeds_dispatches_only_due_feeds():
|
||||
# next_fetch_at (set by fetch_feed itself, C1), not last_fetched_at,
|
||||
# is what poll_due_feeds' query filters on now.
|
||||
never_fetched = Feed.objects.create(feed_url="https://a.example.com/feed.xml")
|
||||
recently_fetched = Feed.objects.create(
|
||||
feed_url="https://b.example.com/feed.xml",
|
||||
last_fetched_at=timezone.now(),
|
||||
next_fetch_at=timezone.now() + timedelta(hours=1),
|
||||
)
|
||||
overdue = Feed.objects.create(
|
||||
feed_url="https://c.example.com/feed.xml",
|
||||
last_fetched_at=timezone.now() - timedelta(hours=2),
|
||||
next_fetch_at=timezone.now() - timedelta(hours=1),
|
||||
)
|
||||
inactive_but_overdue = Feed.objects.create(
|
||||
feed_url="https://d.example.com/feed.xml",
|
||||
last_fetched_at=timezone.now() - timedelta(hours=2),
|
||||
next_fetch_at=timezone.now() - timedelta(hours=1),
|
||||
is_active=False,
|
||||
)
|
||||
|
||||
@@ -45,6 +50,7 @@ def test_poll_due_feeds_does_not_reclaim_a_feed_it_just_claimed():
|
||||
overdue = Feed.objects.create(
|
||||
feed_url="https://c.example.com/feed.xml",
|
||||
last_fetched_at=timezone.now() - timedelta(hours=2),
|
||||
next_fetch_at=timezone.now() - timedelta(hours=1),
|
||||
)
|
||||
|
||||
with patch("apps.feeds.tasks.fetch_feed.delay") as mock_delay:
|
||||
@@ -65,6 +71,7 @@ def test_poll_due_feeds_reclaims_a_stale_claim():
|
||||
overdue = Feed.objects.create(
|
||||
feed_url="https://c.example.com/feed.xml",
|
||||
last_fetched_at=timezone.now() - timedelta(hours=2),
|
||||
next_fetch_at=timezone.now() - timedelta(hours=1),
|
||||
claimed_at=timezone.now() - timedelta(minutes=CLAIM_STALE_MINUTES + 1),
|
||||
)
|
||||
|
||||
@@ -141,3 +148,63 @@ def test_fetch_feed_task_records_error_and_clears_claim_on_unexpected_exception(
|
||||
assert feed.fetch_error_count == 1
|
||||
assert feed.claimed_at is None
|
||||
assert feed.last_fetched_at is not None
|
||||
assert feed.next_fetch_at is not None
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
@responses.activate
|
||||
def test_fetch_feed_task_sets_next_fetch_at_so_poll_due_feeds_can_find_it_later():
|
||||
"""next_fetch_at (C1) is what poll_due_feeds' query filters on — a
|
||||
feed fetch_feed just succeeded on must come back due again only after
|
||||
the configured interval, not immediately."""
|
||||
feed = Feed.objects.create(feed_url="https://example.com/feed.xml")
|
||||
responses.add(responses.GET, feed.feed_url, body=GOOD_FEED_XML, status=200)
|
||||
|
||||
fetch_feed(feed.id)
|
||||
|
||||
feed.refresh_from_db()
|
||||
assert feed.next_fetch_at is not None
|
||||
assert feed.next_fetch_at > timezone.now()
|
||||
|
||||
with patch("apps.feeds.tasks.fetch_feed.delay") as mock_delay:
|
||||
poll_due_feeds()
|
||||
mock_delay.assert_not_called()
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_reset_feed_backoff_makes_the_feed_immediately_due():
|
||||
from apps.feeds.tasks import reset_feed_backoff
|
||||
|
||||
feed = Feed.objects.create(
|
||||
feed_url="https://example.com/feed.xml",
|
||||
fetch_error_count=5,
|
||||
last_fetched_at=timezone.now(),
|
||||
next_fetch_at=timezone.now() + timedelta(hours=12),
|
||||
)
|
||||
|
||||
reset_feed_backoff(feed.id)
|
||||
|
||||
feed.refresh_from_db()
|
||||
assert feed.fetch_error_count == 0
|
||||
assert feed.next_fetch_at is None
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
@responses.activate
|
||||
def test_fetch_feed_schedules_the_next_fetch_using_the_site_wide_interval():
|
||||
"""fetch_feed (not poll_due_feeds — see apps.feeds.tasks.
|
||||
_schedule_next_fetch, C1) is what reads SiteSettings' site-wide
|
||||
interval and sets Feed.next_fetch_at from it after every fetch."""
|
||||
from apps.core.models import SiteSettings
|
||||
|
||||
SiteSettings.objects.create(fetch_interval_minutes=120)
|
||||
feed = Feed.objects.create(feed_url="https://example.com/feed.xml")
|
||||
responses.add(responses.GET, feed.feed_url, body=GOOD_FEED_XML, status=200)
|
||||
|
||||
before = timezone.now()
|
||||
fetch_feed(feed.id)
|
||||
feed.refresh_from_db()
|
||||
|
||||
assert feed.next_fetch_at is not None
|
||||
expected = before + timedelta(minutes=120)
|
||||
assert abs((feed.next_fetch_at - expected).total_seconds()) < 5
|
||||
Reference in new issue
Block a user