[Bugfix] Fix launch render hanging on shutdown (#54913)
Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
This commit is contained in:
@@ -102,7 +102,12 @@ async def serve_http(
|
|||||||
|
|
||||||
loop = asyncio.get_running_loop()
|
loop = asyncio.get_running_loop()
|
||||||
|
|
||||||
watchdog_task = loop.create_task(watchdog_loop(server, app.state.engine_client))
|
engine_client = app.state.engine_client
|
||||||
|
watchdog_task = (
|
||||||
|
loop.create_task(watchdog_loop(server, engine_client))
|
||||||
|
if engine_client is not None
|
||||||
|
else None
|
||||||
|
)
|
||||||
server_task = loop.create_task(server.serve(sockets=[sock] if sock else None))
|
server_task = loop.create_task(server.serve(sockets=[sock] if sock else None))
|
||||||
|
|
||||||
ssl_cert_refresher = (
|
ssl_cert_refresher = (
|
||||||
@@ -133,25 +138,26 @@ async def serve_http(
|
|||||||
async def handle_shutdown() -> None:
|
async def handle_shutdown() -> None:
|
||||||
await shutdown_event.wait()
|
await shutdown_event.wait()
|
||||||
|
|
||||||
engine_client = app.state.engine_client
|
if engine_client is not None:
|
||||||
timeout = engine_client.vllm_config.shutdown_timeout
|
timeout = engine_client.vllm_config.shutdown_timeout
|
||||||
mode = "abort" if timeout == 0 else "drain"
|
mode = "abort" if timeout == 0 else "drain"
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
"[shutdown] API server: stopping engine client mode=%s timeout=%ss",
|
"[shutdown] API server: stopping engine client mode=%s timeout=%ss",
|
||||||
mode,
|
mode,
|
||||||
timeout,
|
timeout,
|
||||||
)
|
)
|
||||||
|
|
||||||
await loop.run_in_executor(
|
await loop.run_in_executor(
|
||||||
None, partial(engine_client.shutdown, timeout=timeout)
|
None, partial(engine_client.shutdown, timeout=timeout)
|
||||||
)
|
)
|
||||||
logger.info_once("[shutdown] API server: engine client stopped")
|
logger.info_once("[shutdown] API server: engine client stopped")
|
||||||
|
|
||||||
server.should_exit = True
|
server.should_exit = True
|
||||||
logger.info_once("[shutdown] API server: signalling HTTP server shutdown")
|
logger.info_once("[shutdown] API server: signalling HTTP server shutdown")
|
||||||
server_task.cancel()
|
server_task.cancel()
|
||||||
watchdog_task.cancel()
|
if watchdog_task is not None:
|
||||||
|
watchdog_task.cancel()
|
||||||
if ssl_cert_refresher:
|
if ssl_cert_refresher:
|
||||||
ssl_cert_refresher.stop()
|
ssl_cert_refresher.stop()
|
||||||
|
|
||||||
@@ -174,7 +180,8 @@ async def serve_http(
|
|||||||
return server.shutdown()
|
return server.shutdown()
|
||||||
finally:
|
finally:
|
||||||
shutdown_task.cancel()
|
shutdown_task.cancel()
|
||||||
watchdog_task.cancel()
|
if watchdog_task is not None:
|
||||||
|
watchdog_task.cancel()
|
||||||
|
|
||||||
|
|
||||||
async def watchdog_loop(server: uvicorn.Server, engine: EngineClient):
|
async def watchdog_loop(server: uvicorn.Server, engine: EngineClient):
|
||||||
|
|||||||
Reference in New Issue
Block a user