[Bugfix][Engine] Make abort idempotent during shutdown (#6327)

Signed-off-by: Allen Wu <allenwu2795@gmail.com>
Co-authored-by: TRAE CLI <noreply@bytedance.com>
Co-authored-by: TRAE CLI <traecli@bytedance.com>
This commit is contained in:
authored and GitHub committed 2026-08-28 19:51:25 -07:00
1 parent 9558fd2ea8
commit d94061201d
5 files changed
+295 -8

No files matched your search

@@ -1,3 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright contributors to the vLLM-Omni project
"""Unit tests for acknowledged abort on AsyncOmniEngine."""
from __future__ import annotations
@@ -19,6 +22,7 @@ pytestmark = [pytest.mark.core_model, pytest.mark.cpu]
def _make_engine(request_q: queue.Queue, rpc_q: queue.Queue) -> AsyncOmniEngine:
engine = object.__new__(AsyncOmniEngine)
engine._shutdown_called = False
engine.request_queue = SimpleNamespace(sync_q=request_q)
engine.rpc_output_queue = SimpleNamespace(sync_q=rpc_q)
engine._correlated_rpc_client = CorrelatedRpcClient(request_q, rpc_q)
@@ -154,3 +158,110 @@ def test_abort_async_preserves_request_queue_backpressure(mocker: MockerFixture)
asyncio.run(_run())
finally:
engine._correlated_rpc_client.close()
def test_abort_async_is_noop_after_shutdown_starts():
engine = object.__new__(AsyncOmniEngine)
engine._shutdown_called = True
engine.request_queue = None
engine._correlated_rpc_client = None
asyncio.run(engine.abort_async(["req-late"]))
def test_abort_async_is_noop_for_empty_request_ids():
engine = object.__new__(AsyncOmniEngine)
engine._shutdown_called = False
engine.request_queue = None
engine._correlated_rpc_client = None
asyncio.run(engine.abort_async([]))
def test_abort_async_tolerates_request_queue_close_during_shutdown(
mocker: MockerFixture,
):
class SyntheticSyncQueueShutDownError(Exception):
pass
rpc_q: queue.Queue = queue.Queue()
engine = object.__new__(AsyncOmniEngine)
engine._shutdown_called = False
class ClosingRequestQueue:
def put(self, item) -> None:
del item
engine._shutdown_called = True
raise SyntheticSyncQueueShutDownError
request_q = ClosingRequestQueue()
engine.request_queue = SimpleNamespace(sync_q=request_q)
engine._correlated_rpc_client = CorrelatedRpcClient(request_q, rpc_q)
mocker.patch(
"vllm_omni.engine.async_engine_utils._JANUS_SYNC_QUEUE_SHUTDOWN",
SyntheticSyncQueueShutDownError,
)
try:
asyncio.run(engine.abort_async(["req-submit-race"], timeout=1))
finally:
engine._correlated_rpc_client.close()
def test_abort_async_surfaces_request_queue_close_while_engine_is_live(
mocker: MockerFixture,
):
class SyntheticSyncQueueShutDownError(Exception):
pass
class ClosedRequestQueue:
def put(self, item) -> None:
del item
raise SyntheticSyncQueueShutDownError
request_q = ClosedRequestQueue()
rpc_q: queue.Queue = queue.Queue()
engine = object.__new__(AsyncOmniEngine)
engine._shutdown_called = False
engine.request_queue = SimpleNamespace(sync_q=request_q)
engine._correlated_rpc_client = CorrelatedRpcClient(request_q, rpc_q)
mocker.patch(
"vllm_omni.engine.async_engine_utils._JANUS_SYNC_QUEUE_SHUTDOWN",
SyntheticSyncQueueShutDownError,
)
try:
with pytest.raises(SyntheticSyncQueueShutDownError):
asyncio.run(engine.abort_async(["req-live-submit"], timeout=1))
finally:
engine._correlated_rpc_client.close()
def test_abort_async_tolerates_rpc_router_close_during_shutdown():
request_q: queue.Queue = queue.Queue()
rpc_q: queue.Queue = queue.Queue()
engine = _make_engine(request_q, rpc_q)
async def _run() -> None:
task = asyncio.create_task(engine.abort_async(["req-ack-race"], timeout=1))
await asyncio.to_thread(request_q.get, True, 1)
engine._shutdown_called = True
engine._correlated_rpc_client.close()
await task
asyncio.run(_run())
def test_abort_async_surfaces_rpc_router_close_while_engine_is_live():
request_q: queue.Queue = queue.Queue()
rpc_q: queue.Queue = queue.Queue()
engine = _make_engine(request_q, rpc_q)
async def _run() -> None:
task = asyncio.create_task(engine.abort_async(["req-live"], timeout=1))
await asyncio.to_thread(request_q.get, True, 1)
engine._correlated_rpc_client.close()
with pytest.raises(RuntimeError, match="RPC result router closed"):
await task
asyncio.run(_run())
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright contributors to the vLLM-Omni project
import pytest
import torch
from pytest_mock import MockerFixture
@@ -14,6 +17,104 @@ from vllm_omni.model_executor.stage_input_processors.bagel import ExpandedPrompt
pytestmark = [pytest.mark.core_model, pytest.mark.cpu]
class _SyntheticSyncQueueShutDownError(Exception):
pass
def test_abort_is_noop_for_empty_request_ids(mocker: MockerFixture):
engine = object.__new__(AsyncOmniEngine)
engine._shutdown_called = False
engine.request_queue = mocker.Mock()
engine.abort([])
engine.request_queue.sync_q.put.assert_not_called()
def test_abort_is_noop_after_shutdown_starts(mocker: MockerFixture):
engine = object.__new__(AsyncOmniEngine)
engine._shutdown_called = True
engine.request_queue = mocker.Mock()
engine.abort(["req-1"])
engine.request_queue.sync_q.put.assert_not_called()
def test_abort_tolerates_queue_close_race_during_shutdown(mocker: MockerFixture):
engine = object.__new__(AsyncOmniEngine)
engine._shutdown_called = False
engine.request_queue = mocker.Mock()
mocker.patch(
"vllm_omni.engine.async_engine_utils._JANUS_SYNC_QUEUE_SHUTDOWN",
_SyntheticSyncQueueShutDownError,
)
def close_queue_during_abort(*args, **kwargs):
del args, kwargs
engine._shutdown_called = True
raise _SyntheticSyncQueueShutDownError
engine.request_queue.sync_q.put.side_effect = close_queue_during_abort
engine.abort(["req-1"])
def test_abort_tolerates_legacy_janus_close_error_during_shutdown(mocker: MockerFixture):
engine = object.__new__(AsyncOmniEngine)
engine._shutdown_called = False
engine.request_queue = mocker.Mock()
mocker.patch(
"vllm_omni.engine.async_engine_utils._JANUS_SYNC_QUEUE_SHUTDOWN",
None,
)
def close_queue_during_abort(*args, **kwargs):
del args, kwargs
engine._shutdown_called = True
raise RuntimeError("Operation on the closed queue is forbidden")
engine.request_queue.sync_q.put.side_effect = close_queue_during_abort
engine.abort(["req-1"])
def test_abort_surfaces_unrelated_legacy_runtime_error_during_shutdown(
mocker: MockerFixture,
):
engine = object.__new__(AsyncOmniEngine)
engine._shutdown_called = False
engine.request_queue = mocker.Mock()
mocker.patch(
"vllm_omni.engine.async_engine_utils._JANUS_SYNC_QUEUE_SHUTDOWN",
None,
)
def fail_during_abort(*args, **kwargs):
del args, kwargs
engine._shutdown_called = True
raise RuntimeError("unrelated queue failure")
engine.request_queue.sync_q.put.side_effect = fail_during_abort
with pytest.raises(RuntimeError, match="unrelated queue failure"):
engine.abort(["req-1"])
def test_abort_surfaces_unexpected_closed_queue(mocker: MockerFixture):
engine = object.__new__(AsyncOmniEngine)
engine._shutdown_called = False
engine.request_queue = mocker.Mock()
mocker.patch(
"vllm_omni.engine.async_engine_utils._JANUS_SYNC_QUEUE_SHUTDOWN",
_SyntheticSyncQueueShutDownError,
)
engine.request_queue.sync_q.put.side_effect = _SyntheticSyncQueueShutDownError
with pytest.raises(_SyntheticSyncQueueShutDownError):
engine.abort(["req-1"])
def _make_engine_core_request(request_id: str = "req-1") -> EngineCoreRequest:
return EngineCoreRequest(
request_id=request_id,