Fix DB connection leak in buffercache logic, other connection related cleanup #663
Conversation
This file contains 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
Because the buffercache logic initializes its own database (so it can run in parallel to other collection tasks), it needs to also ensure to close its DB handle so the connection is released again. In passing avoid the double assignment of "db" in the later parts of the function.
This makes it clear that we must clean up the database connection that was established, since we leak connections otherwise. To support this, refactor the log-based EXPLAIN code so defer can be used easily.
In almost all cases we have an existing database connection, so use that to retrieve the value of Postgres settings.
keiko713
approved these changes
Jan 8, 2025
| @@ -72,16 +71,10 @@ SELECT setting | |||
| FROM pg_settings | |||
| WHERE name = '%s'` | |||
|
|
|||
| func GetPostgresSetting(ctx context.Context, settingName string, server *state.Server, globalCollectionOpts state.CollectionOpts, prefixedLogger *util.Logger) (string, error) { | |||
| func GetPostgresSetting(ctx context.Context, db *sql.DB, settingName string) (string, error) { | |||
There was a problem hiding this comment.
This looks cleaner, but I wonder why we weren't doing this previously 🤔
There was a problem hiding this comment.
Looks like it started out being used in a context where we didn't have a pre-existing connection (runner/logs.go in cbf2f08), and we later used the same helper in other places, without refactoring it.
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.
See individual commits.