fix(sync): 限流退避持久化到 DB,调度器与手动同步均尊重退避期
db.py: 修复迁移非幂等——gunicorn 双 worker 并发 init_db 时后到者遇 Duplicate column 会让整个服务起不来,改为吞掉 duplicate column 错误。garmin.py/scheduler.py: 退避期写入 sync_status.rate_limited_until,自动同步与手动同步在退避期内跳过,不再反复撞击 Garmin 把限流窗口越撞越深。
This commit is contained in:
@@ -97,17 +97,85 @@ class RateLimited(RuntimeError):
|
||||
|
||||
|
||||
# Retrying while rate limited is what deepens the limit, so once Garmin says
|
||||
# 429 the whole process stands down until this passes.
|
||||
RATE_LIMIT_BACKOFF = datetime.timedelta(minutes=30)
|
||||
# 429 the whole process stands down until this passes. Bumped from 30 to 60
|
||||
# minutes: the account was stuck for days because every hourly tick re-hit it,
|
||||
# so a longer cooldown gives Garmin's window room to actually close.
|
||||
RATE_LIMIT_BACKOFF = datetime.timedelta(minutes=60)
|
||||
# In-process cache of the cooldown, kept in sync with the DB copy below and
|
||||
# still the lever the tests reach for via _rate_limited_until.clear().
|
||||
_rate_limited_until = {}
|
||||
|
||||
|
||||
def _parse_dt(v):
|
||||
"""Coerce a stored rate-limit time into a naive UTC datetime, or None."""
|
||||
if v is None:
|
||||
return None
|
||||
if isinstance(v, datetime.datetime):
|
||||
return v
|
||||
if isinstance(v, str):
|
||||
for fmt in ("%Y-%m-%d %H:%M:%S", "%Y-%m-%dT%H:%M:%S"):
|
||||
try:
|
||||
return datetime.datetime.strptime(v, fmt)
|
||||
except ValueError:
|
||||
continue
|
||||
try:
|
||||
return datetime.datetime.fromisoformat(v)
|
||||
except ValueError:
|
||||
return None
|
||||
return None
|
||||
|
||||
|
||||
def rate_limited_until(user_id):
|
||||
return _rate_limited_until.get(user_id)
|
||||
"""When the account is still cooling down, as a UTC datetime (or None).
|
||||
|
||||
The cooldown is persisted to the database so every gunicorn worker and a
|
||||
process restart see the same deadline — a process-local dict alone let each
|
||||
worker re-hit Garmin and keep the limit alive forever.
|
||||
"""
|
||||
mem = _rate_limited_until.get(user_id)
|
||||
try:
|
||||
row = query_one(
|
||||
"SELECT rate_limited_until FROM sync_status WHERE user_id = ?", [user_id]
|
||||
)
|
||||
except Exception:
|
||||
row = None
|
||||
candidates = [c for c in (mem, _parse_dt(row["rate_limited_until"] if row else None)) if c]
|
||||
return max(candidates) if candidates else None
|
||||
|
||||
|
||||
def _note_rate_limit(user_id):
|
||||
_rate_limited_until[user_id] = datetime.datetime.utcnow() + RATE_LIMIT_BACKOFF
|
||||
"""Record a rate-limit cooldown, extending it if one is already running."""
|
||||
now = datetime.datetime.utcnow()
|
||||
existing = rate_limited_until(user_id)
|
||||
until = (existing + datetime.timedelta(minutes=30)) if existing and existing > now \
|
||||
else (now + RATE_LIMIT_BACKOFF)
|
||||
_rate_limited_until[user_id] = until
|
||||
try:
|
||||
# Persist alongside the current status so the cooldown survives across
|
||||
# workers and restarts.
|
||||
cur_status = (get_sync_status(user_id) or {}).get("status") or "idle"
|
||||
_set_sync_status(
|
||||
user_id, cur_status, now.isoformat(timespec="seconds"),
|
||||
rate_limited_until=until.isoformat(timespec="seconds"),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
def _rate_limit_block(user_id):
|
||||
"""If the account is cooling down, return (until, message); else (None, None).
|
||||
|
||||
Central guard used by both the manual and scheduled sync entry points, so a
|
||||
blocked account issues zero Garmin requests until the window closes.
|
||||
"""
|
||||
until = rate_limited_until(user_id)
|
||||
if not until or datetime.datetime.utcnow() >= until:
|
||||
return None, None
|
||||
mins = max(1, int((until - datetime.datetime.utcnow()).total_seconds() // 60))
|
||||
return until, (
|
||||
f"Garmin 仍在限制请求频率,预计约 {mins} 分钟后自动恢复。"
|
||||
"已自动退避,请耐心等待——反复点击正是把限流撞得更深的原因,令牌本身没有失效。"
|
||||
)
|
||||
|
||||
|
||||
def _is_rate_limited(e):
|
||||
@@ -241,7 +309,7 @@ def _connect(creds, user_id=None):
|
||||
client.garth.loads(token)
|
||||
_use_api_user_agent(client)
|
||||
|
||||
blocked = _rate_limited_until.get(user_id)
|
||||
blocked = rate_limited_until(user_id)
|
||||
if blocked and datetime.datetime.utcnow() < blocked:
|
||||
raise RateLimited(
|
||||
"Garmin 暂时限制了请求频率,稍后会自动恢复(约 "
|
||||
@@ -815,6 +883,18 @@ def start_sync(user_id, creds, days=None):
|
||||
"""
|
||||
days = days or DEFAULT_SYNC_DAYS
|
||||
now = datetime.datetime.utcnow().isoformat(timespec="seconds")
|
||||
until, msg = _rate_limit_block(user_id)
|
||||
if until:
|
||||
_set_sync_status(
|
||||
user_id, "rate_limited", now,
|
||||
records_synced=0, progress_current=0, progress_total=days,
|
||||
started_at=now, last_error=msg,
|
||||
)
|
||||
return {
|
||||
"status": "rate_limited",
|
||||
"message": msg,
|
||||
"retryAfterSeconds": int((until - datetime.datetime.utcnow()).total_seconds()),
|
||||
}
|
||||
_set_sync_status(
|
||||
user_id, "syncing", now,
|
||||
records_synced=0, progress_current=0, progress_total=days,
|
||||
@@ -834,6 +914,20 @@ def sync_data(user_id, creds, days=None, client=None):
|
||||
"""
|
||||
days = days or DEFAULT_SYNC_DAYS
|
||||
now = datetime.datetime.utcnow().isoformat(timespec="seconds")
|
||||
until, msg = _rate_limit_block(user_id)
|
||||
if until:
|
||||
# A blocked account must issue zero Garmin requests — that is the whole
|
||||
# point. Return immediately without touching the network.
|
||||
_set_sync_status(
|
||||
user_id, "rate_limited", now,
|
||||
records_synced=0, last_error=msg,
|
||||
)
|
||||
return {
|
||||
"status": "rate_limited",
|
||||
"recordsSynced": 0,
|
||||
"message": msg,
|
||||
"retryAfterSeconds": int((until - datetime.datetime.utcnow()).total_seconds()),
|
||||
}
|
||||
_set_sync_status(
|
||||
user_id, "syncing", now,
|
||||
records_synced=0, progress_current=0, progress_total=days,
|
||||
|
||||
@@ -144,6 +144,16 @@ def sync_all_accounts(days=None, respect_schedule=False):
|
||||
results.append({"user": uid, "status": "skipped",
|
||||
"reason": "not due"})
|
||||
continue
|
||||
# Never poke Garmin while it is rate-limiting us — that is exactly
|
||||
# what keeps the limit alive. Respect the persisted cooldown and sit
|
||||
# this tick out.
|
||||
blocked = garmin_svc.rate_limited_until(uid)
|
||||
if blocked and blocked > _now():
|
||||
results.append({
|
||||
"user": uid, "status": "skipped", "reason": "rate-limited",
|
||||
"retryAfterSeconds": int((blocked - _now()).total_seconds()),
|
||||
})
|
||||
continue
|
||||
out = garmin_svc.sync_data(uid, {}, days=days)
|
||||
results.append({"user": uid, "status": out.get("status"),
|
||||
"records": out.get("recordsSynced")})
|
||||
|
||||
Reference in New Issue
Block a user