mirror of
https://git.datalinker.icu/vllm-project/vllm.git
synced 2026-06-05 03:29:08 +08:00
remove handle_proxy_request
Signed-off-by: inkcherry <mingzhi.liu@amd.com>
This commit is contained in:
parent
38d51f6dd8
commit
72ccb5d77c
@ -1361,22 +1361,12 @@ class MoRIIOConnectorWorker:
|
|||||||
f":tp {self.tp_rank}:dp {self.dp_rank}"
|
f":tp {self.tp_rank}:dp {self.dp_rank}"
|
||||||
)
|
)
|
||||||
if not self.is_producer:
|
if not self.is_producer:
|
||||||
self.poller = zmq.Poller()
|
|
||||||
self.metadata_socket = self.zmq_context.socket(zmq.ROUTER)
|
|
||||||
self.metadata_socket.bind(f"tcp://{self.metadata_address}")
|
|
||||||
self.poller.register(self.metadata_socket, zmq.POLLIN)
|
|
||||||
|
|
||||||
self.moriio_engine = IOEngine(
|
self.moriio_engine = IOEngine(
|
||||||
"consumer:" + engine_suffix,
|
"consumer:" + engine_suffix,
|
||||||
IOEngineConfig(
|
IOEngineConfig(
|
||||||
self.moriio_config.local_ip, self.moriio_config.local_kv_port
|
self.moriio_config.local_ip, self.moriio_config.local_kv_port
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
self._handle_request_thread = threading.Thread(
|
|
||||||
target=self.handle_proxy_request, daemon=True
|
|
||||||
)
|
|
||||||
self._handle_request_thread.start()
|
|
||||||
else:
|
else:
|
||||||
self.moriio_engine = IOEngine(
|
self.moriio_engine = IOEngine(
|
||||||
"producer:" + engine_suffix,
|
"producer:" + engine_suffix,
|
||||||
@ -1384,7 +1374,6 @@ class MoRIIOConnectorWorker:
|
|||||||
self.moriio_config.local_ip, self.moriio_config.local_kv_port
|
self.moriio_config.local_ip, self.moriio_config.local_kv_port
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
logger.debug(
|
logger.debug(
|
||||||
"build MORI IOEngine %s:%s",
|
"build MORI IOEngine %s:%s",
|
||||||
self.moriio_config.local_ip,
|
self.moriio_config.local_ip,
|
||||||
@ -1609,23 +1598,23 @@ class MoRIIOConnectorWorker:
|
|||||||
"Max retries (%s) exceeded. Stopping ping loop.",
|
"Max retries (%s) exceeded. Stopping ping loop.",
|
||||||
MoRIIOConstants.MAX_PING_RETRIES,
|
MoRIIOConstants.MAX_PING_RETRIES,
|
||||||
)
|
)
|
||||||
should_break = True
|
should_break = True
|
||||||
time.sleep(MoRIIOConstants.PING_INTERVAL)
|
time.sleep(MoRIIOConstants.PING_INTERVAL)
|
||||||
index += 1
|
index += 1
|
||||||
if should_break:
|
if should_break:
|
||||||
break
|
break
|
||||||
|
|
||||||
def handle_proxy_request(self):
|
# def handle_proxy_request(self):
|
||||||
if self.is_producer:
|
# if self.is_producer:
|
||||||
raise NotImplementedError(
|
# raise NotImplementedError(
|
||||||
"prefill instance doesn't need to send kv cache in pull mode"
|
# "prefill instance doesn't need to send kv cache in pull mode"
|
||||||
)
|
# )
|
||||||
while True:
|
# while True:
|
||||||
socks = dict(self.poller.poll())
|
# socks = dict(self.poller.poll())
|
||||||
logger.debug("handle_proxy_request: socks = %s", socks)
|
# logger.debug("handle_proxy_request: socks = %s", socks)
|
||||||
|
|
||||||
if self.metadata_socket not in socks:
|
# if self.metadata_socket not in socks:
|
||||||
continue
|
# continue
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
if hasattr(self, "_handshake_initiation_executor"):
|
if hasattr(self, "_handshake_initiation_executor"):
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user