Skip to content

fix: Enhance error handling for closed and broken resources in retry … #2929

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

Closed
utkarshkingh wants to merge 10 commits into from
Closed

fix: Enhance error handling for closed and broken resources in retry … #2929

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bed3f23
fix: Enhance error handling for closed and broken resources in retry …
utkarshkingh Sep 11, 2025
adff656
refactor: Improve code formatting and enhance docstrings for clarity
utkarshkingh Sep 11, 2025
28c9193
Merge branch 'main' into main
utkarshkingh Sep 14, 2025
cd6057f
Merge branch 'main' into main
utkarshkingh Sep 16, 2025
4b1528a
keep header the same as before, keep all original comments - only add…
utkarshkingh Sep 16, 2025
a0f74db
Merge branch 'main' into main
hangfei Nov 4, 2025
2e1a31a
Merge branch 'google:main' into main
utkarshkingh Nov 4, 2025
11bc644
style: Clean up whitespace and formatting in mcp_session_manager.py
utkarshkingh Nov 4, 2025
b9a74d3
Merge branch 'main' into main
wukath Nov 6, 2025
265e7e1
Merge branch 'main' into main
utkarshkingh Nov 9, 2025
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
View file
Open in desktop
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)
Comment thread
utkarshkingh marked this conversation as resolved.

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