fix: use ConnectionResetError in TLSUpgradeProto.connection_lost#1312
Open
yemreck wants to merge 1 commit intoMagicStack:masterfrom
Open
fix: use ConnectionResetError in TLSUpgradeProto.connection_lost#1312yemreck wants to merge 1 commit intoMagicStack:masterfrom
yemreck wants to merge 1 commit intoMagicStack:masterfrom
Conversation
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.
Summary
Fixes #1310.
TLSUpgradeProto.connection_lost()synthesizes a genericConnectionError("unexpected connection_lost() call")when the server closes the connection during SSL negotiation (exc=None). This error type is not handled by asyncpg's ownConnection._cancel(), which only catchesConnectionResetError:The generic
ConnectionErrorfalls through to theexcept (Exception, ...)handler and leaks into application code, causing confusing unhandled errors.The problem in practice
When
pool_pre_pingsends a trivial query (fetchrow(";")) that gets cancelled (e.g. due to asyncio task cancellation under load), the following cascade occurs:fetchrow(";")getsCancelledErrorfinallyblock triesawait tr.rollback()Connection._cancel()via the cancel side-channel_cancel()opens an SSL connection →TLSUpgradeProto→ server closes during negotiation →connection_lost(exc=None)ConnectionError("unexpected connection_lost() call")propagates unhandled to application codeThe fix
Use
ConnectionResetErrorinstead ofConnectionError. This is:Connection._cancel()already catchesConnectionResetErrorexplicitlydata_received('PostgreSQL server at "{host}:{port}" rejected SSL upgrade')ConnectionResetErroris a subclass ofConnectionError, so any existingexcept ConnectionErrorcatches still workTest plan
"unexpected connection_lost")ConnectionResetErroris caught byConnection._cancel()'s existing handler