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
@@ -0,0 +1,49 @@
|
||||
from datetime import timedelta
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
def backfill_next_fetch_at(apps, schema_editor):
|
||||
"""One-time backfill for feeds that existed before next_fetch_at (C1) —
|
||||
everything created after this migration gets it set by fetch_feed
|
||||
itself. Mirrors the exact formula apps.feeds.services.fetcher.
|
||||
effective_interval_minutes used to compute on every poll tick, just
|
||||
run once here instead of forever after.
|
||||
"""
|
||||
Feed = apps.get_model("feeds", "Feed")
|
||||
SiteSettings = apps.get_model("core", "SiteSettings")
|
||||
|
||||
configured_interval = 60
|
||||
settings_row = SiteSettings.objects.filter(pk=1).first()
|
||||
if settings_row is not None:
|
||||
configured_interval = settings_row.fetch_interval_minutes
|
||||
|
||||
floor = getattr(settings, "EVECTION_MIN_FETCH_INTERVAL_MINUTES", 15)
|
||||
base = max(configured_interval, floor)
|
||||
max_backoff = 24 * 60
|
||||
|
||||
for feed in Feed.objects.filter(last_fetched_at__isnull=False).only(
|
||||
"id", "last_fetched_at", "fetch_error_count"
|
||||
):
|
||||
if feed.fetch_error_count <= 0:
|
||||
interval = base
|
||||
else:
|
||||
interval = min(base * (2**feed.fetch_error_count), max_backoff)
|
||||
feed.next_fetch_at = feed.last_fetched_at + timedelta(minutes=interval)
|
||||
feed.save(update_fields=["next_fetch_at"])
|
||||
|
||||
|
||||
def noop_reverse(apps, schema_editor):
|
||||
pass
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("feeds", "0005_feed_next_fetch_at_and_more"),
|
||||
("core", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(backfill_next_fetch_at, noop_reverse),
|
||||
]
|
||||
Reference in new issue
Block a user