From 811d80519552e2964c2e0e808b66d9a24931bf1e Mon Sep 17 00:00:00 2001 From: omerpaz95 <73347585+omerpaz95@users.noreply.github.com> Date: Thu, 28 May 2026 15:28:01 +0300 Subject: [PATCH] [EC Connector] Add shutdown API to EC Connector. (#42423) Signed-off-by: omerpaz95 --- vllm/distributed/ec_transfer/__init__.py | 2 ++ vllm/distributed/ec_transfer/ec_connector/base.py | 8 ++++++++ vllm/distributed/ec_transfer/ec_transfer_state.py | 7 +++++++ vllm/v1/core/sched/scheduler.py | 2 ++ vllm/v1/worker/gpu_worker.py | 7 ++++++- 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/vllm/distributed/ec_transfer/__init__.py b/vllm/distributed/ec_transfer/__init__.py index 0decfd143e..d14f74a723 100644 --- a/vllm/distributed/ec_transfer/__init__.py +++ b/vllm/distributed/ec_transfer/__init__.py @@ -3,6 +3,7 @@ from vllm.distributed.ec_transfer.ec_transfer_state import ( ensure_ec_transfer_initialized, + ensure_ec_transfer_shutdown, get_ec_transfer, has_ec_transfer, ) @@ -10,5 +11,6 @@ from vllm.distributed.ec_transfer.ec_transfer_state import ( __all__ = [ "get_ec_transfer", "ensure_ec_transfer_initialized", + "ensure_ec_transfer_shutdown", "has_ec_transfer", ] diff --git a/vllm/distributed/ec_transfer/ec_connector/base.py b/vllm/distributed/ec_transfer/ec_connector/base.py index 7f1407d0cf..28370c8e1f 100644 --- a/vllm/distributed/ec_transfer/ec_connector/base.py +++ b/vllm/distributed/ec_transfer/ec_connector/base.py @@ -79,6 +79,14 @@ class ECConnectorBase(ABC): def is_consumer(self) -> bool: return self._is_consumer + def shutdown(self) -> None: + """ + Shutdown the connector. This is called when the process + is shutting down to ensure that all the async operations are + completed and the connector is cleaned up properly. + """ + return None + # ============================== # Worker-side methods # ============================== diff --git a/vllm/distributed/ec_transfer/ec_transfer_state.py b/vllm/distributed/ec_transfer/ec_transfer_state.py index ef3c978b36..e58415ef6f 100644 --- a/vllm/distributed/ec_transfer/ec_transfer_state.py +++ b/vllm/distributed/ec_transfer/ec_transfer_state.py @@ -40,3 +40,10 @@ def ensure_ec_transfer_initialized(vllm_config: "VllmConfig") -> None: _EC_CONNECTOR_AGENT = ECConnectorFactory.create_connector( config=vllm_config, role=ECConnectorRole.WORKER ) + + +def ensure_ec_transfer_shutdown() -> None: + global _EC_CONNECTOR_AGENT + if _EC_CONNECTOR_AGENT is not None: + _EC_CONNECTOR_AGENT.shutdown() + _EC_CONNECTOR_AGENT = None diff --git a/vllm/v1/core/sched/scheduler.py b/vllm/v1/core/sched/scheduler.py index 6ce9dcc075..73d3dcb4b6 100644 --- a/vllm/v1/core/sched/scheduler.py +++ b/vllm/v1/core/sched/scheduler.py @@ -2041,6 +2041,8 @@ class Scheduler(SchedulerInterface): self.kv_event_publisher.shutdown() if self.connector is not None: self.connector.shutdown() + if self.ec_connector is not None: + self.ec_connector.shutdown() ######################################################################## # KV Connector Related Methods diff --git a/vllm/v1/worker/gpu_worker.py b/vllm/v1/worker/gpu_worker.py index 582c6a17cb..e63f50bc8d 100644 --- a/vllm/v1/worker/gpu_worker.py +++ b/vllm/v1/worker/gpu_worker.py @@ -23,7 +23,10 @@ from vllm.distributed import ( init_distributed_environment, set_custom_all_reduce, ) -from vllm.distributed.ec_transfer import ensure_ec_transfer_initialized +from vllm.distributed.ec_transfer import ( + ensure_ec_transfer_initialized, + ensure_ec_transfer_shutdown, +) from vllm.distributed.eplb.eplb_utils import override_envs_for_eplb from vllm.distributed.kv_transfer import ( ensure_kv_transfer_initialized, @@ -1101,6 +1104,8 @@ class Worker(WorkerBase): # has_kv_transfer_group can be None during interpreter shutdown. if ensure_kv_transfer_shutdown is not None: ensure_kv_transfer_shutdown() + if ensure_ec_transfer_shutdown is not None: + ensure_ec_transfer_shutdown() if self.profiler is not None: self.profiler.shutdown()