[Fix] Wire the detokenizer soft watchdog into the multi-http-worker event loop (#31392)

This commit is contained in:
Liangsheng Yin
2026-07-15 21:55:46 -07:00
committed by GitHub
parent bc525dcf90
commit b871a509e6
@@ -381,29 +381,31 @@ class MultiHttpWorkerDetokenizerMixin:
def multi_http_worker_event_loop(self: DetokenizerManager):
"""The event loop that handles requests, for multi multi-http-worker mode"""
self.socket_mapping = SocketMapping()
# Watchdog wiring mirrors DetokenizerManager.event_loop: the watchdog is
# paused while waiting for input and fed once per processed message.
while True:
recv_obj = sock_recv(self.recv_from_scheduler)
with self.soft_watchdog.disable():
recv_obj = sock_recv(self.recv_from_scheduler)
output = self._request_dispatcher(recv_obj)
if output is None:
continue
# Fan out the output back to the originating tokenizer worker(s).
# In multi-detokenizer mode the upstream MultiDetokenizerRouter may
# forward either batched or single requests, so handle both shapes.
if isinstance(recv_obj, BaseBatchReq):
for i, ipc_name in enumerate(recv_obj.http_worker_ipcs):
new_output = _handle_output_by_index(output, i)
if output is not None:
# Fan out the output back to the originating tokenizer worker(s).
# In multi-detokenizer mode the upstream MultiDetokenizerRouter may
# forward either batched or single requests, so handle both shapes.
if isinstance(recv_obj, BaseBatchReq):
for i, ipc_name in enumerate(recv_obj.http_worker_ipcs):
new_output = _handle_output_by_index(output, i)
self.socket_mapping.send_output(
ipc_name, new_output, is_tokenizer=True
)
elif isinstance(recv_obj, BaseReq):
self.socket_mapping.send_output(
ipc_name, new_output, is_tokenizer=True
recv_obj.http_worker_ipc, output, is_tokenizer=True
)
elif isinstance(recv_obj, BaseReq):
self.socket_mapping.send_output(
recv_obj.http_worker_ipc, output, is_tokenizer=True
)
else:
raise ValueError(
f"multi_http_worker_event_loop got unexpected req type {type(recv_obj)}"
)
else:
raise ValueError(
f"multi_http_worker_event_loop got unexpected req type {type(recv_obj)}"
)
self.soft_watchdog.feed()
class MultiTokenizerRouter: