Prevent stuck cancellation from blocking connection teardown - #1370
Merged
Merged
Conversation
There was a problem hiding this comment.
Copilot review overview
🟢 Approval recommended
No unresolved blocking issues were identified.
Review effort: Lite
Findings: None
What changed in this PR
Prevents stalled PostgreSQL cancellation requests from blocking connection and pool teardown.
Changes:
- Applies timeout budgets to cancellation waits.
- Aborts connections when cancellation exceeds its deadline.
- Adds regression tests for connection, pool, and network-loss scenarios.
| File | Summary |
|---|---|
tests/test_timeout.py |
Tests cancellation and close timeouts. |
tests/test_pool.py |
Tests pool release during cancellation. |
tests/test_adversity.py |
Tests cancellation during network loss. |
asyncpg/protocol/protocol.pyx |
Adds timeout-aware cancellation and teardown. |
asyncpg/protocol/protocol.pyi |
Updates cancellation method typing. |
asyncpg/pool.py |
Propagates release timeout budgets. |
asyncpg/connection.py |
Tracks and cleans up cancellation tasks. |
asyncpg/connect_utils.py |
Safely cleans up cancellation transports. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
elprans
force-pushed
the
cancellation-timeout
branch
from
September 23, 2026 18:20
0cf4c21 to
526444b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Use connection command timeout budget when waiting for cancellation and
abort the connection if cancellation cannot finish in time.
Fixes: #1326
Closes: #1349