feat(automation): 让在线熔断阈值作用于自动重登
This commit is contained in:
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
更新时间:2026-11-21
|
更新时间:2026-11-21
|
||||||
|
|
||||||
整体完成度约 **65%**。
|
整体完成度约 **66%**。
|
||||||
|
|
||||||
| 阶段 | 完成度 | 已落地 | 主要缺口 |
|
| 阶段 | 完成度 | 已落地 | 主要缺口 |
|
||||||
| --- | ---: | --- | --- |
|
| --- | ---: | --- | --- |
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
| 阶段 1:同步基础 | 95% | 新表、迁移、storehome 网关、全量快照、同步运行记录、内部工作队列执行器、session/points/gold/elite/esports/role/exchange 同步状态 | 少量旁路查询仍需继续收口 |
|
| 阶段 1:同步基础 | 95% | 新表、迁移、storehome 网关、全量快照、同步运行记录、内部工作队列执行器、session/points/gold/elite/esports/role/exchange 同步状态 | 少量旁路查询仍需继续收口 |
|
||||||
| 阶段 2:账号与 CK | 90% | CK 周期字段、invalid 分流、登录流水、日/小时/分类/单账号预算、login_relogin 队列真实消费与退避回队、预算配置 API | 更精细的动态预算计算 |
|
| 阶段 2:账号与 CK | 90% | CK 周期字段、invalid 分流、登录流水、日/小时/分类/单账号预算、login_relogin 队列真实消费与退避回队、预算配置 API | 更精细的动态预算计算 |
|
||||||
| 阶段 3:商品与供给 | 60% | 全量商品能力、限时窗口、原始响应、供给库存和目标缺口、定向补货入队、供给目标配置 API、统一平台状态快照 | 默认供给目标、供给看板、阈值告警 |
|
| 阶段 3:商品与供给 | 60% | 全量商品能力、限时窗口、原始响应、供给库存和目标缺口、定向补货入队、供给目标配置 API、统一平台状态快照 | 默认供给目标、供给看板、阈值告警 |
|
||||||
| 阶段 4:安全恢复自动化 | 45% | account_sync_queue 与供给补货作业默认小批量开启,自动重登消费工作队列,硬失败率熔断,登录预算在线配置 | 灰度批次自动扩缩和长期趋势告警 |
|
| 阶段 4:安全恢复自动化 | 50% | account_sync_queue 与供给补货作业默认小批量开启,自动重登消费工作队列,硬失败率熔断,登录预算在线配置且熔断阈值实时生效 | 灰度批次自动扩缩和长期趋势告警 |
|
||||||
| 阶段 5:清理旧逻辑 | 20% | 履约补货不再直接发官网请求 | 旧资料刷新、旁路查询和旧候选兜底仍需逐步下线 |
|
| 阶段 5:清理旧逻辑 | 20% | 履约补货不再直接发官网请求 | 旧资料刷新、旁路查询和旧候选兜底仍需逐步下线 |
|
||||||
|
|
||||||
## 为什么重构
|
## 为什么重构
|
||||||
|
|||||||
@@ -20,7 +20,13 @@ CK 解耦(2026-10-04)后,**选行与退避进度的单位是账号**:``c
|
|||||||
from datetime import UTC, datetime, timedelta
|
from datetime import UTC, datetime, timedelta
|
||||||
|
|
||||||
from tests.support.db import get_test_engine, make_test_session
|
from tests.support.db import get_test_engine, make_test_session
|
||||||
from web.backend.models import Account, AutomationJob, LoginTask, User
|
from web.backend.models import (
|
||||||
|
Account,
|
||||||
|
AutomationJob,
|
||||||
|
LoginQuotaSetting,
|
||||||
|
LoginTask,
|
||||||
|
User,
|
||||||
|
)
|
||||||
from web.backend.services.account_lifecycle import derive_status
|
from web.backend.services.account_lifecycle import derive_status
|
||||||
from web.backend.services.automation import register_default_jobs, reset_registry
|
from web.backend.services.automation import register_default_jobs, reset_registry
|
||||||
from web.backend.services.automation.jobs import ck_relogin
|
from web.backend.services.automation.jobs import ck_relogin
|
||||||
@@ -162,6 +168,27 @@ class TestFailureClassification(_Base):
|
|||||||
|
|
||||||
|
|
||||||
class TestFailureCircuit(_Base):
|
class TestFailureCircuit(_Base):
|
||||||
|
def test_online_quota_circuit_threshold_is_used(self):
|
||||||
|
self.session.add(
|
||||||
|
LoginQuotaSetting(
|
||||||
|
id=1,
|
||||||
|
failure_pause_ratio=25,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.session.commit()
|
||||||
|
|
||||||
|
resolved = ck_relogin.resolve_failure_circuit_config(
|
||||||
|
self.session,
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
overridden = ck_relogin.resolve_failure_circuit_config(
|
||||||
|
self.session,
|
||||||
|
{"failure_pause_ratio": 60},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert resolved["failure_pause_ratio"] == 25
|
||||||
|
assert overridden["failure_pause_ratio"] == 60
|
||||||
|
|
||||||
def test_hard_failure_ratio_pauses_job(self):
|
def test_hard_failure_ratio_pauses_job(self):
|
||||||
paused, hard, ratio = ck_relogin.evaluate_failure_circuit(
|
paused, hard, ratio = ck_relogin.evaluate_failure_circuit(
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ from sqlalchemy import func, or_
|
|||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from ....database import WorkerSessionLocal
|
from ....database import WorkerSessionLocal
|
||||||
from ....models import Account, AutomationJob, LoginTask, User
|
from ....models import Account, AutomationJob, LoginQuotaSetting, LoginTask, User
|
||||||
from ....models import ProxyConfig as ProxyConfigModel
|
from ....models import ProxyConfig as ProxyConfigModel
|
||||||
from ...account_events_service import EVENT_RELOGIN_FAILED, emit
|
from ...account_events_service import EVENT_RELOGIN_FAILED, emit
|
||||||
from ...account_lifecycle import (
|
from ...account_lifecycle import (
|
||||||
@@ -252,9 +252,28 @@ def evaluate_failure_circuit(
|
|||||||
return scanned >= minimum and ratio > threshold, hard_failures, ratio
|
return scanned >= minimum and ratio > threshold, hard_failures, ratio
|
||||||
|
|
||||||
|
|
||||||
|
def resolve_failure_circuit_config(
|
||||||
|
db: Session,
|
||||||
|
config: dict[str, Any] | None,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""合并作业配置和在线登录预算里的失败暂停阈值。"""
|
||||||
|
resolved = dict(config or {})
|
||||||
|
if "failure_pause_ratio" not in resolved:
|
||||||
|
setting = (
|
||||||
|
db.query(LoginQuotaSetting)
|
||||||
|
.filter(LoginQuotaSetting.id == 1)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if setting is not None:
|
||||||
|
resolved["failure_pause_ratio"] = int(
|
||||||
|
setting.failure_pause_ratio
|
||||||
|
)
|
||||||
|
return resolved
|
||||||
|
|
||||||
|
|
||||||
def run_ck_relogin(db: Session, job: AutomationJob) -> dict[str, Any]:
|
def run_ck_relogin(db: Session, job: AutomationJob) -> dict[str, Any]:
|
||||||
now = datetime.now(UTC)
|
now = datetime.now(UTC)
|
||||||
config = job.config or {}
|
config = resolve_failure_circuit_config(db, job.config)
|
||||||
max_attempts = int(config.get("max_attempts_per_day", 2) or 2)
|
max_attempts = int(config.get("max_attempts_per_day", 2) or 2)
|
||||||
|
|
||||||
system_user_id = _system_user_id(db)
|
system_user_id = _system_user_id(db)
|
||||||
|
|||||||
Reference in New Issue
Block a user