diff --git a/tests/v1/kv_connector/unit/test_moriio_connector.py b/tests/v1/kv_connector/unit/test_moriio_connector.py index 2a5c96a46e..cfac6fa5a3 100644 --- a/tests/v1/kv_connector/unit/test_moriio_connector.py +++ b/tests/v1/kv_connector/unit/test_moriio_connector.py @@ -23,6 +23,7 @@ from vllm.distributed.kv_transfer.kv_connector.v1.moriio.moriio_common import ( MoRIIOAgentMetadata, MoRIIOConnectorMetadata, MoRIIOConstants, + resolve_host_ip, zmq_ctx, ) from vllm.distributed.kv_transfer.kv_connector.v1.moriio.moriio_connector import ( @@ -568,3 +569,14 @@ def test_moriio_handshake_returns_metadata(mock_parallel_groups): assert isinstance(metadata, MoRIIOAgentMetadata), ( "Decoded metadata is not MoRIIOAgentMetadata" ) + + +def test_resolve_host_ip_prefers_extra_config(): + """An explicit ``host_ip`` in kv_connector_extra_config overrides get_ip() + (so an external router can advertise a routable/internal address); an + absent or empty value falls back to get_ip().""" + assert resolve_host_ip({"host_ip": "10.0.0.7"}) == "10.0.0.7" + + fallback = get_ip() + assert resolve_host_ip({}) == fallback + assert resolve_host_ip({"host_ip": ""}) == fallback diff --git a/vllm/distributed/kv_transfer/kv_connector/v1/moriio/moriio_common.py b/vllm/distributed/kv_transfer/kv_connector/v1/moriio/moriio_common.py index 73694ce321..73b3d2e148 100644 --- a/vllm/distributed/kv_transfer/kv_connector/v1/moriio/moriio_common.py +++ b/vllm/distributed/kv_transfer/kv_connector/v1/moriio/moriio_common.py @@ -177,6 +177,18 @@ def get_port_offset(dp_rank: int, tp_rank: int, tp_size: int = 1) -> int: return (dp_rank) * tp_size + tp_rank +def resolve_host_ip(extra_config: dict) -> str: + """The IP this MoRIIO process advertises for KV transfer. + + Honors an explicit ``host_ip`` in ``kv_connector_extra_config`` before + falling back to ``get_ip()``. An external router/orchestrator can set it to + the node's routable address; this is required under frameworks (e.g. Ray) + where ``get_ip()`` resolves to an unroutable public IP and ``VLLM_HOST_IP`` + cannot be propagated to the worker processes that bind the transfer engine. + """ + return extra_config.get("host_ip") or get_ip() + + _DEPRECATED_ENV_VARS: dict[str, str] = { "VLLM_MORIIO_CONNECTOR_READ_MODE": "read_mode", "VLLM_MORIIO_QP_PER_TRANSFER": "qp_per_transfer", @@ -276,7 +288,7 @@ class MoRIIOConfig: ) return cls( - local_ip=get_ip(), + local_ip=resolve_host_ip(extra_config), local_kv_port=get_open_port(), proxy_ip=extra_config["proxy_ip"], local_ping_port=get_open_port(), diff --git a/vllm/distributed/kv_transfer/kv_connector/v1/moriio/moriio_connector.py b/vllm/distributed/kv_transfer/kv_connector/v1/moriio/moriio_connector.py index 167eef6e1c..b5552f7204 100644 --- a/vllm/distributed/kv_transfer/kv_connector/v1/moriio/moriio_connector.py +++ b/vllm/distributed/kv_transfer/kv_connector/v1/moriio/moriio_connector.py @@ -39,6 +39,7 @@ from vllm.distributed.kv_transfer.kv_connector.v1.moriio.moriio_common import ( get_port_offset, get_role, parse_moriio_zmq_address, + resolve_host_ip, set_role, zmq_ctx, ) @@ -54,7 +55,6 @@ from vllm.distributed.parallel_state import ( from vllm.forward_context import ForwardContext from vllm.logger import init_logger from vllm.utils.network_utils import ( - get_ip, make_zmq_path, make_zmq_socket, ) @@ -105,7 +105,7 @@ class MoRIIOConnector(KVConnectorBase_V1): self._set_port_defaults(vllm_config) self.engine_id = ( - str(get_ip()) + str(resolve_host_ip(self.kv_transfer_config.kv_connector_extra_config)) + ":" + str(self.kv_transfer_config.kv_connector_extra_config["handshake_port"]) ) @@ -256,7 +256,9 @@ class MoRIIOConnectorScheduler: self.block_size = vllm_config.cache_config.block_size self.engine_id: EngineId = engine_id self.mode = get_moriio_mode(self.kv_transfer_config) - self.host_ip = get_ip() + self.host_ip = resolve_host_ip( + self.kv_transfer_config.kv_connector_extra_config + ) self.handshake_port = self.kv_transfer_config.kv_connector_extra_config[ "handshake_port" ]