Skip to content
Open
Changes from 1 commit
Commits
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
11 changes: 8 additions & 3 deletions src/google/adk/tools/mcp_tool/mcp_session_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ def retry_on_closed_resource(func):
async def wrapper(self, *args, **kwargs):
try:
return await func(self, *args, **kwargs)
except anyio.ClosedResourceError:
except (anyio.ClosedResourceError, anyio.BrokenResourceError):
# Simply retry the function - create_session will handle
# detecting and replacing disconnected sessions
logger.info('Retrying %s due to closed resource', func.__name__)
logger.info('Retrying %s due to closed/broken resource', func.__name__)
return await func(self, *args, **kwargs)

return wrapper
Expand Down Expand Up @@ -369,7 +369,12 @@ async def create_session(
except Exception:
# If session creation fails, clean up the exit stack
if exit_stack:
await exit_stack.aclose()
try:
await exit_stack.aclose()
except (anyio.BrokenResourceError, anyio.ClosedResourceError) as e:
# Resources might already be broken/closed due to connection issues
# Log the error but don't let it mask the original exception
logger.warning('Error during exit stack cleanup: %s', e)
raise

async def close(self):
Expand Down