Add server-side temporary storage controls for 3.9.3

This commit is contained in:
Miura Yoshiki
2026-10-13 12:18:23 +00:00
parent e9b1294ccd
commit d8fbf287a9
34 changed files with 2288 additions and 66 deletions
+11
View File
@@ -36,7 +36,9 @@ from .file_backed_buffer import (
allocate_file_backed_image,
format_auto_buffer_decision,
select_auto_buffer_backend,
preflight_manual_buffer,
)
from .. import storage_settings
from .plan import FPS, validate_assembly_plan, REVIEW_AUDIO_PROJECTION_KEY
@@ -619,6 +621,7 @@ def _assemble_decoded_chunks_v35_core(
resolved_backend = buffer_backend
resolved_backing_root = backing_root
auto_decision_report = None
final_image_bytes = math.prod(shape) * first_image.element_size()
if buffer_backend == BUFFER_BACKEND_AUTO:
final_image_bytes = (
math.prod(shape) * first_image.element_size()
@@ -630,6 +633,8 @@ def _assemble_decoded_chunks_v35_core(
resolved_backend = decision.selected_backend
resolved_backing_root = decision.backing_root
auto_decision_report = format_auto_buffer_decision(decision)
else:
preflight_manual_buffer(buffer_backend, final_image_bytes, backing_root)
allocation: Any
if resolved_backend == BUFFER_BACKEND_RAM:
@@ -641,6 +646,11 @@ def _assemble_decoded_chunks_v35_core(
backing_root=resolved_backing_root,
)
with allocation:
settings = storage_settings.get_manager()
if settings is not None:
from .file_backed_buffer import resolve_backing_root
settings.record_backend(resolved_backend, final_image_bytes,
resolve_backing_root(resolved_backing_root) if resolved_backend == BUFFER_BACKEND_DISK else None)
# The file exists at this point, so an ESC received immediately before
# assembly exercises the same unpublished cleanup path as a mid-copy
# cancellation.
@@ -675,6 +685,7 @@ def _assemble_decoded_chunks_v35_core(
return result_images, result_audio, report
@storage_settings.storage_operation
def assemble_decoded_chunks_v35(
*,
images: list[Any],
+39 -14
View File
@@ -17,10 +17,13 @@ import threading
import torch
from ..storage_memory import system_memory_bytes
from .. import storage_settings
from ..tools.p20_file_backed_tensor_poc import (
FileBackedAllocation,
StorageLifetimeManager,
cleanup_stale_files,
inspect_managed_files,
get_process_lifetime_manager,
)
@@ -65,13 +68,7 @@ class AutoBufferDecision:
def _system_memory_bytes() -> tuple[int | None, int | None]:
try:
import psutil
counters = psutil.virtual_memory()
return int(counters.available), int(counters.total)
except Exception:
return None, None
return system_memory_bytes()
def _existing_disk_anchor(path: Path) -> Path:
@@ -84,9 +81,29 @@ def _existing_disk_anchor(path: Path) -> Path:
def _disk_free_bytes(path: Path) -> int:
manager = storage_settings.get_manager()
if manager is not None:
manager.verify_final_root(path)
return int(shutil.disk_usage(_existing_disk_anchor(path)).free)
def preflight_manual_buffer(backend, final_image_bytes, backing_root=None):
if backend == BUFFER_BACKEND_RAM:
available, total = _system_memory_bytes()
if available is None or total is None:
raise RuntimeError("RAM buffer safety check unavailable; use Auto or Disk-backed, or restore memory counters")
reserve = max(AUTO_RAM_RESERVE_MIN_BYTES, int(total * AUTO_RAM_RESERVE_FRACTION))
if available < final_image_bytes + reserve:
raise RuntimeError(f"RAM buffer needs {final_image_bytes} bytes plus {reserve} bytes reserve; "
f"only {available} bytes are available. Select Auto or Disk-backed.")
elif backend == BUFFER_BACKEND_DISK:
root = resolve_backing_root(backing_root)
free = _disk_free_bytes(root)
if free < final_image_bytes + AUTO_DISK_RESERVE_BYTES:
raise RuntimeError(f"Disk-backed buffer needs {final_image_bytes + AUTO_DISK_RESERVE_BYTES} bytes "
f"including reserve; {free} bytes are free at {root}")
def select_auto_buffer_backend(
final_image_bytes: int,
*,
@@ -201,7 +218,9 @@ def resolve_backing_root(
if value is None or not str(value).strip():
raise RuntimeError("ComfyUI returned an empty temporary directory")
base = Path(value)
return (base.expanduser().resolve() / _BACKING_DIRECTORY_NAME).resolve()
default = (base.expanduser().resolve() / _BACKING_DIRECTORY_NAME).resolve()
manager = storage_settings.get_manager()
return manager.resolve("finalize", default, verify=False) if manager else default
def get_file_backed_image_manager(
@@ -210,15 +229,21 @@ def get_file_backed_image_manager(
"""Return the accepted process-global manager for one resolved root."""
root = resolve_backing_root(backing_root)
settings = storage_settings.get_manager()
if settings is not None:
settings.verify_final_root(root)
key = os.path.normcase(str(root))
with _CLEANED_ROOTS_LOCK:
if key not in _CLEANED_ROOTS:
# The P2-0 root lock prevents cleanup from observing an allocation
# between its data-file and sidecar publication. A live owner is
# always retained; only prior abnormal-exit artifacts are removed.
cleanup_stale_files(root, grace_seconds=0.0)
# Production startup and the UI share conservative ownership rules.
# The standalone recovery probe can still inspect legacy orphans;
# an unknown production file is never deleted by its name alone.
inspect_managed_files(root, cleanup=True)
_CLEANED_ROOTS.add(key)
return get_process_lifetime_manager(root)
manager = get_process_lifetime_manager(root)
if settings is not None:
settings.record_root("finalize", root)
return manager
def allocate_file_backed_image(