[Core] cleanup zmq ipc sockets on exit (#11115)
Signed-off-by: Russell Bryant <rbryant@redhat.com>
This commit is contained in:
+14
-2
@@ -4,6 +4,7 @@ import queue
|
||||
import signal
|
||||
import threading
|
||||
import time
|
||||
from dataclasses import dataclass
|
||||
from multiprocessing.process import BaseProcess
|
||||
from typing import List, Tuple, Type, Union
|
||||
|
||||
@@ -129,6 +130,14 @@ class EngineCore:
|
||||
self.model_executor.profile(is_start)
|
||||
|
||||
|
||||
@dataclass
|
||||
class EngineCoreProcHandle:
|
||||
proc: BaseProcess
|
||||
ready_path: str
|
||||
input_path: str
|
||||
output_path: str
|
||||
|
||||
|
||||
class EngineCoreProc(EngineCore):
|
||||
"""ZMQ-wrapper for running EngineCore in background process."""
|
||||
|
||||
@@ -200,7 +209,7 @@ class EngineCoreProc(EngineCore):
|
||||
input_path: str,
|
||||
output_path: str,
|
||||
ready_path: str,
|
||||
) -> BaseProcess:
|
||||
) -> EngineCoreProcHandle:
|
||||
# The current process might have CUDA context,
|
||||
# so we need to spawn a new process.
|
||||
# NOTE(rob): this is a problem for using EngineCoreProc w/
|
||||
@@ -222,7 +231,10 @@ class EngineCoreProc(EngineCore):
|
||||
|
||||
# Wait for startup
|
||||
EngineCoreProc.wait_for_startup(proc, ready_path)
|
||||
return proc
|
||||
return EngineCoreProcHandle(proc=proc,
|
||||
ready_path=ready_path,
|
||||
input_path=input_path,
|
||||
output_path=output_path)
|
||||
|
||||
@staticmethod
|
||||
def run_engine_core(*args, **kwargs):
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import atexit
|
||||
import os
|
||||
from typing import List, Union
|
||||
|
||||
import msgspec
|
||||
@@ -148,7 +149,7 @@ class MPClient(EngineCoreClient):
|
||||
self.input_socket.bind(input_path)
|
||||
|
||||
# Start EngineCore in background process.
|
||||
self.proc = EngineCoreProc.make_engine_core_process(
|
||||
self.proc_handle = EngineCoreProc.make_engine_core_process(
|
||||
*args,
|
||||
input_path=input_path,
|
||||
output_path=output_path,
|
||||
@@ -161,13 +162,24 @@ class MPClient(EngineCoreClient):
|
||||
# Shut down the zmq context.
|
||||
self.ctx.destroy(linger=0)
|
||||
|
||||
# Shutdown the process if needed.
|
||||
if hasattr(self, "proc") and self.proc.is_alive():
|
||||
self.proc.terminate()
|
||||
self.proc.join(5)
|
||||
if hasattr(self, "proc_handle"):
|
||||
# Shutdown the process if needed.
|
||||
if self.proc_handle.proc.is_alive():
|
||||
self.proc_handle.proc.terminate()
|
||||
self.proc_handle.proc.join(5)
|
||||
|
||||
if self.proc.is_alive():
|
||||
kill_process_tree(self.proc.pid)
|
||||
if self.proc_handle.proc.is_alive():
|
||||
kill_process_tree(self.proc_handle.proc.pid)
|
||||
|
||||
# Remove zmq ipc socket files
|
||||
ipc_sockets = [
|
||||
self.proc_handle.ready_path, self.proc_handle.output_path,
|
||||
self.proc_handle.input_path
|
||||
]
|
||||
for ipc_socket in ipc_sockets:
|
||||
socket_file = ipc_socket.replace("ipc://", "")
|
||||
if os.path.exists(socket_file):
|
||||
os.remove(socket_file)
|
||||
|
||||
def __del__(self):
|
||||
self.shutdown()
|
||||
|
||||
Reference in New Issue
Block a user