From 6b67885588de57ddbccc0e8e0fc1e99012a50b1a Mon Sep 17 00:00:00 2001
From: GitHub <action@github.com>
Date: Tue, 1 Sep 2026 22:46:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(web):=20=E4=BB=BB=E5=8A=A1=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E8=B7=83=E8=BF=81=E5=9C=A8=E9=94=81=E5=86=85=E5=85=88?=
 =?UTF-8?q?=E8=90=BD=E7=9B=98=E5=86=8D=E5=AF=B9=E5=86=85=E5=AD=98=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=EF=BC=8C=E6=B6=88=E9=99=A4=20done/running=20=E7=AB=9E?=
 =?UTF-8?q?=E6=80=81=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CI（ubuntu 3.12 + coverage 插桩）复现：_run 在锁内置内存状态为 done 后才在锁外
persist SQLite，测试轮询到内存 done 立即读库仍见 running。慢速环境下窗口被
放大。修法与 submit 的 pending 写法对齐：running/done/failed 三次跃迁均在
同一把锁内先 _persist_locked 再改内存字段，状态对外可见前必已落盘（本地
15 次压测 + 1252 全量回归通过）。
---
 src/easy_tdx/web/task_runner.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/easy_tdx/web/task_runner.py b/src/easy_tdx/web/task_runner.py
index fa9ab73..48ebefb 100644
--- a/src/easy_tdx/web/task_runner.py
+++ b/src/easy_tdx/web/task_runner.py
@@ -194,7 +194,9 @@ class BacktestTaskRunner:
 
         状态写入用本地 ``state`` 引用，不假设条目仍在 ``self._tasks`` 中——
         并发淘汰可能在任务运行期间移除条目。``move_to_end`` 容忍 KeyError。
-        每次状态跃迁（running/done/failed）同步落盘 SQLite。
+        每次状态跃迁（running/done/failed）在**同一把锁内**落盘 SQLite——
+        先持久化再对内存可见，杜绝「内存已 done、磁盘仍 running」的窗口
+        （慢速环境下读库方会命中该窗口）。
         """
         # 取本地引用；若已被淘汰则静默退出（无副作用）
         with self._lock:
@@ -204,7 +206,7 @@ class BacktestTaskRunner:
                 return
             state.status = "running"
             state.started_at = time.time()
-        self._persist(state)
+            self._persist_locked(state)
 
         try:
             result = func()
@@ -213,6 +215,7 @@ class BacktestTaskRunner:
                 state.result = result
                 state.status = "done"
                 state.finished_at = time.time()
+                self._persist_locked(state)
                 try:
                     self._tasks.move_to_end(task_id)
                 except KeyError:
@@ -223,11 +226,11 @@ class BacktestTaskRunner:
                 state.error = f"{type(exc).__name__}: {exc}"
                 state.status = "failed"
                 state.finished_at = time.time()
+                self._persist_locked(state)
                 try:
                     self._tasks.move_to_end(task_id)
                 except KeyError:
                     pass
-        self._persist(state)
 
     # ── SQLite 持久化辅助 ─────────────────────────────────────────────────────
 
@@ -247,11 +250,6 @@ class BacktestTaskRunner:
         except Exception:  # noqa: BLE001 — 持久化故障不阻断回测主流程
             logger.exception("任务 %s 持久化失败（不影响任务本身）", state.task_id)
 
-    def _persist(self, state: TaskState) -> None:
-        """把状态快照落盘（工作线程跃迁后调用，state 已稳定）。"""
-        with self._lock:
-            self._persist_locked(state)
-
     def _restore_from_store(self, task_id: str) -> TaskState | None:
         """从磁盘恢复任务到内存（内存淘汰/进程重启后的查询兜底）。"""
         try: