fix(monitor): 抖音任务的 run 永远停在「排队中」—— 我上一版把状态标记缩进错了
用户报的现象:任务一直显示「排队中」。查库确认有两批 run 卡在 pending(任务 7 的 44/45、 任务 15 的 62/63)。两个原因,一个是我上一版改坏的: 1) **`RUN_RUNNING` 被我缩进进了爬虫那条分支。** 抖音走的是另一条路,于是它**从不标记 「运行中」** —— 建完 pending 那一行就直接进采集,中途一旦出事(异常、进程被重启), 状态就永远停在 pending。这是我加平台分岔时把原本在两条路公共位置的一行挪进去了。 2) **`recover()` 只收 `running`,够不着 `pending`。** 那行是上一轮建的、后面的采集却 根本没机会开始(进程重启),它永远不会自己往前走。于是重启也救不回来,界面上就是 一个永远「排队中」的幽灵。现在 pending 一起收。 两处都补了测试:抖音路的 run 必须在**采集开始之前**就已经是 running(这条改回去就会 失败);recover 要把 pending 也标成 interrupted。
This commit is contained in:
@@ -51,7 +51,13 @@ from tools.time_util import get_current_timestamp
|
||||
from ..services import crawler_manager
|
||||
from . import app_settings, schedule, upstream
|
||||
from .db import get_session
|
||||
from .models import MonitorRun, MonitorTask, RUN_INTERRUPTED, RUN_RUNNING
|
||||
from .models import (
|
||||
RUN_INTERRUPTED,
|
||||
RUN_PENDING,
|
||||
RUN_RUNNING,
|
||||
MonitorRun,
|
||||
MonitorTask,
|
||||
)
|
||||
from .runner import execute_task
|
||||
from .settings import get_cookie
|
||||
|
||||
@@ -147,11 +153,17 @@ class MonitorScheduler:
|
||||
A run still marked ``running`` cannot be running -- its subprocess died
|
||||
with the previous process. Marking it interrupted stops it from blocking
|
||||
the UI as a phantom in-flight run.
|
||||
|
||||
**``pending`` 同样是残留**:那一行是上一轮建的,可它后面的采集根本没机会开始
|
||||
(进程被重启,或者采集那条路抛了异常),所以它永远不会自己往前走。只清 running
|
||||
的话,它会永远挂在界面上显示「排队中」—— 用户看到的就是任务卡住了。
|
||||
"""
|
||||
async with get_session() as session:
|
||||
stale = (
|
||||
await session.scalars(
|
||||
select(MonitorRun).where(MonitorRun.status == RUN_RUNNING)
|
||||
select(MonitorRun).where(
|
||||
MonitorRun.status.in_((RUN_RUNNING, RUN_PENDING))
|
||||
)
|
||||
)
|
||||
).all()
|
||||
for run in stale:
|
||||
|
||||
Reference in New Issue
Block a user