[Bugfix] Prevent stale multiproc RPC deadlines from becoming unbounded waits (#41357)
Signed-off-by: bugkeep <1921817430@qq.com> Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -909,7 +909,8 @@ class MessageQueue:
|
||||
|
||||
@staticmethod
|
||||
def recv(socket: zmq.Socket, timeout: float | None) -> Any:
|
||||
timeout_ms = None if timeout is None else int(timeout * 1000)
|
||||
# Ensure non-negative timeout passed to zmq poll.
|
||||
timeout_ms = None if timeout is None else max(0, int(timeout * 1000))
|
||||
if not socket.poll(timeout=timeout_ms):
|
||||
raise TimeoutError
|
||||
recv, *recv_oob = socket.recv_multipart(copy=False)
|
||||
|
||||
@@ -395,7 +395,7 @@ class MultiprocExecutor(Executor):
|
||||
responses = []
|
||||
for mq in response_mqs:
|
||||
dequeue_timeout = (
|
||||
None if deadline is None else (deadline - time.monotonic())
|
||||
None if deadline is None else max(0.0, deadline - time.monotonic())
|
||||
)
|
||||
try:
|
||||
status, result = mq.dequeue(timeout=dequeue_timeout)
|
||||
|
||||
Reference in New Issue
Block a user