Skip to content

fix: suppress RuntimeError in MCP task shutdown when event loop is closed #80955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shaiful-hisham wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −13
Open

fix: suppress RuntimeError in MCP task shutdown when event loop is closed #80955

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions tools/mcp_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2320,11 +2320,15 @@ async def _wait_for_lifecycle_event(self) -> str:
finally:
for t in (shutdown_task, reconnect_task):
if not t.done():
t.cancel()
try:
await t
except (asyncio.CancelledError, Exception):
pass
t.cancel()
except RuntimeError:
pass # loop already closed during shutdown; skip cancel
else:
try:
await t
except (asyncio.CancelledError, Exception):
pass

if self._shutdown_event.is_set():
return "shutdown"
Expand Down Expand Up @@ -2364,11 +2368,15 @@ async def _wait_for_reconnect_or_shutdown(
finally:
for t in (shutdown_task, reconnect_task):
if not t.done():
t.cancel()
try:
await t
except (asyncio.CancelledError, Exception):
pass
t.cancel()
except RuntimeError:
pass # loop already closed during shutdown; skip cancel
else:
try:
await t
except (asyncio.CancelledError, Exception):
pass
if self._shutdown_event.is_set():
return "shutdown"
self._reconnect_event.clear()
Expand Down Expand Up @@ -3518,11 +3526,15 @@ async def _wait_for_lazy_reconnect(self) -> None:
finally:
for task in (shutdown_task, reconnect_task):
if not task.done():
task.cancel()
try:
await task
except (asyncio.CancelledError, Exception):
pass
task.cancel()
except RuntimeError:
pass # loop already closed during shutdown; skip cancel
else:
try:
await task
except (asyncio.CancelledError, Exception):
pass


# ---------------------------------------------------------------------------
Expand Down Expand Up @@ -7205,7 +7217,7 @@ def _stop_mcp_loop(*, only_if_idle: bool = False) -> bool:
)
except BaseException as exc:
logger.warning("Error draining MCP loop tasks: %s", exc)
elif not loop.is_closed():
if not stop_owned_by_loop and not loop.is_closed():
try:
loop.run_until_complete(
_drain_mcp_loop_tasks(timeout=_MCP_LOOP_DRAIN_TIMEOUT)
Expand Down