postgres/pgx: don't leak the conn from WithInstance when init fails - #1397
Open
c-tonneslan wants to merge 1 commit into
Open
postgres/pgx: don't leak the conn from WithInstance when init fails#1397c-tonneslan wants to merge 1 commit into
c-tonneslan wants to merge 1 commit into
Conversation
WithInstance pulled a connection out of the *sql.DB pool and then called ensureLockTable / ensureVersionTable. If either of those failed the connection was never returned to the pool, and a caller that retried (or just expected WithInstance failures to be benign) leaked one conn per attempt until the pool ran out. Close the conn on every error path between Conn() and a successful return. Same fix applied to database/postgres, database/pgx, and database/pgx/v5 since they all share the pattern. Fixes golang-migrate#1366. Signed-off-by: Charlie Tonneslan <cst0520@gmail.com>
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
1 participant
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.
Fixes #1366.
`WithInstance` pulls a connection out of the `*sql.DB` pool and then runs `ensureLockTable` / `ensureVersionTable`. If either of those fails the connection was never returned to the pool, so a caller that retried (or just expected `WithInstance` failures to be recoverable) leaked one conn per attempt until the pool ran out.
`Close` the conn on every error path between `Conn()` and a successful return. Same fix applied to `database/postgres`, `database/pgx`, and `database/pgx/v5` since they all share the pattern.