fix(runtime): distinguish event loop owners (#6425)

Co-authored-by: jxxghp <jxxghp@gmail.com>
This commit is contained in:
InfinityPacer
2026-08-23 21:40:23 +08:00
committed by GitHub
co-authored by jxxghp
parent f64030a074
commit eb36e6be91
4 changed files with 76 additions and 17 deletions
+22 -7
View File
@@ -1361,6 +1361,11 @@ class GlobalVar(object):
# 生命周期登记的主事件循环
CURRENT_EVENT_LOOP: Optional[AbstractEventLoop] = None
def __init__(self) -> None:
self.CURRENT_EVENT_LOOP = None
self._event_loop_owners: dict[object, AbstractEventLoop] = {}
self._event_loop_owner_lock = threading.Lock()
def stop_system(self):
"""
停止系统
@@ -1456,14 +1461,24 @@ class GlobalVar(object):
raise RuntimeError("主事件循环尚未启动或已经停止")
return loop
def set_loop(self, loop: AbstractEventLoop) -> None:
"""登记承载主程序异步任务的事件循环"""
self.CURRENT_EVENT_LOOP = loop
def set_loop(self, loop: AbstractEventLoop) -> object:
"""登记主事件循环,并返回仅供当前生命周期释放的 owner"""
owner = object()
with self._event_loop_owner_lock:
self._event_loop_owners[owner] = loop
self.CURRENT_EVENT_LOOP = loop
return owner
def clear_loop(self, loop: AbstractEventLoop) -> None:
"""仅在登记值仍为目标循环时清除主事件循环"""
if self.CURRENT_EVENT_LOOP is loop:
self.CURRENT_EVENT_LOOP = None
def clear_loop(self, owner: object) -> None:
"""释放指定 owner,保留仍然有效的其他生命周期登记"""
with self._event_loop_owner_lock:
if owner not in self._event_loop_owners:
return
self._event_loop_owners.pop(owner)
self.CURRENT_EVENT_LOOP = next(
reversed(self._event_loop_owners.values()),
None,
)
# 全局标识
+6 -3
View File
@@ -513,6 +513,7 @@ async def lifespan(app: FastAPI):
health = get_application_health(app)
health.begin_startup()
main_loop = asyncio.get_running_loop()
main_loop_owner: object | None = None
enabled_components: tuple[LifecycleComponent, ...] = ()
started_component_names: set[str] = set()
active_start_component: LifecycleComponent | None = None
@@ -522,7 +523,7 @@ async def lifespan(app: FastAPI):
safe_mode=settings.MOVIEPILOT_SAFE_MODE,
)
print("Starting up...")
global_vars.set_loop(main_loop)
main_loop_owner = global_vars.set_loop(main_loop)
components = build_lifecycle_components(app)
enabled_components = tuple(
component
@@ -567,7 +568,8 @@ async def lifespan(app: FastAPI):
except Exception as cleanup_error:
logger.error(f"启动失败后的生命周期清理失败:{cleanup_error}")
finally:
global_vars.clear_loop(main_loop)
if main_loop_owner is not None:
global_vars.clear_loop(main_loop_owner)
raise
try:
# 在此处 yield,表示应用已经启动,控制权交回 FastAPI 主事件循环
@@ -585,4 +587,5 @@ async def lifespan(app: FastAPI):
# 日志最后关闭,确保其他组件的收尾信息已写入文件
LoggerManager.shutdown()
finally:
global_vars.clear_loop(main_loop)
if main_loop_owner is not None:
global_vars.clear_loop(main_loop_owner)