"tests/vscode:/vscode.git/clone" did not exist on "c6fa3895e90f6daef4d223188f6b4156311f40c9"
Unverified Commit 6a18d878 authored by Nick Hill's avatar Nick Hill Committed by GitHub
Browse files

[Core] Fix benign error log during normal shutdown (#36270)


Signed-off-by: default avatarNick Hill <nickhill123@gmail.com>
Co-authored-by: default avatarMark McLoughlin <markmc@redhat.com>
parent 24a03915
...@@ -567,10 +567,7 @@ class MPClient(EngineCoreClient): ...@@ -567,10 +567,7 @@ class MPClient(EngineCoreClient):
) )
with launch_core_engines( with launch_core_engines(
vllm_config, vllm_config, executor_class, log_stats, addresses
executor_class,
log_stats,
addresses,
) as (engine_manager, coordinator, addresses): ) as (engine_manager, coordinator, addresses):
self.resources.coordinator = coordinator self.resources.coordinator = coordinator
self.resources.engine_manager = engine_manager self.resources.engine_manager = engine_manager
...@@ -638,7 +635,7 @@ class MPClient(EngineCoreClient): ...@@ -638,7 +635,7 @@ class MPClient(EngineCoreClient):
def shutdown(self, timeout: float | None = None) -> None: def shutdown(self, timeout: float | None = None) -> None:
"""Shutdown engine manager under timeout and clean up resources.""" """Shutdown engine manager under timeout and clean up resources."""
self._finalizer.detach() if self._finalizer.detach() is not None:
if self.resources.engine_manager is not None: if self.resources.engine_manager is not None:
self.resources.engine_manager.shutdown(timeout=timeout) self.resources.engine_manager.shutdown(timeout=timeout)
self.resources() self.resources()
...@@ -685,7 +682,7 @@ class MPClient(EngineCoreClient): ...@@ -685,7 +682,7 @@ class MPClient(EngineCoreClient):
sentinels = [proc.sentinel for proc in engine_processes] sentinels = [proc.sentinel for proc in engine_processes]
died = multiprocessing.connection.wait(sentinels) died = multiprocessing.connection.wait(sentinels)
_self = self_ref() _self = self_ref()
if not _self or _self.resources.engine_dead: if not _self or not _self._finalizer.alive or _self.resources.engine_dead:
return return
_self.resources.engine_dead = True _self.resources.engine_dead = True
proc_name = next( proc_name = next(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment