alphard/ComfyUI-Lora-Manager
1
0
Fork 0
mirror of https://github.com/willmiao/ComfyUI-Lora-Manager.git synced 2026-08-06 22:10:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

fix(downloader): hold session lock in retry paths to prevent session close race

Browse Source 
Refactor _create_session() to make-before-break: snapshot old session,
assign new one first, then close old.  Previously, concurrent download
retries called _create_session() without the session lock (violating its
docstring contract) and closed the old session while other coroutines
held active references — causing aiohttp to raise "NoneType has no
attribute connect" when dereferencing the torn-down connector.

Also wrap the two _create_session() calls in the integrity-retry and
network-retry paths with self._session_lock to match the locking
discipline used by the session property and refresh_session().
This commit is contained in:
Will Miao
2026-07-17 17:21:05 +08:00
parent 6f71335be4
commit 090e0297d4
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
py/services/downloader.py
View File

@@ -270,14 +270,14 @@ class Downloader:
Note: This is private and caller MUST hold self._session_lock. Note: This is private and caller MUST hold self._session_lock.
""" """
# Close existing session if any # Snapshot and clear old session reference before creating the new
if self._session is not None: # one. This ensures self._session is always valid (or None, which
try: # triggers a fresh creation) and avoids a race where concurrent
await self._session.close() # requests hold a reference to a session whose connector has been
except Exception as e: # pragma: no cover # torn down by a premature close() call — the root cause of the
logger.warning(f"Error closing previous session: {e}") # intermittent "NoneType has no attribute connect" crash.
finally: old_session = self._session
self._session = None self._session = None
# Check for app-level proxy settings # Check for app-level proxy settings
proxy_url = None # http(s) proxy, passed via the per-request `proxy=` kwarg proxy_url = None # http(s) proxy, passed via the per-request `proxy=` kwarg
@@ -372,6 +372,13 @@ class Downloader:
self._proxy_url = proxy_url self._proxy_url = proxy_url
self._session_created_at = datetime.now() self._session_created_at = datetime.now()
# Close the previous session now that the replacement is live.
if old_session is not None:
try:
await old_session.close()
except Exception as e: # pragma: no cover
logger.warning(f"Error closing previous session: {e}")
logger.debug( logger.debug(
"Created new HTTP session with proxy settings. App-level proxy: %s, System-level proxy (trust_env): %s", "Created new HTTP session with proxy settings. App-level proxy: %s, System-level proxy (trust_env): %s",
bool(proxy_url), bool(proxy_url),
@@ -753,7 +760,8 @@ class Downloader:
else: else:
resume_offset = 0 resume_offset = 0
total_size = 0 total_size = 0
await self._create_session() async with self._session_lock:
await self._create_session()
continue continue
return False, integrity_error return False, integrity_error
@@ -843,7 +851,8 @@ class Downloader:
logger.info(f"Will resume from byte {resume_offset}") logger.info(f"Will resume from byte {resume_offset}")
# Refresh session to get new connection # Refresh session to get new connection
await self._create_session() async with self._session_lock:
await self._create_session()
continue continue
else: else:
logger.error(f"Max retries exceeded for download: {e}") logger.error(f"Max retries exceeded for download: {e}")