[collector]bugfix: close jdbc connection on statement creation failure#4184
Open
hutiefang76 wants to merge 3 commits into
Open
[collector]bugfix: close jdbc connection on statement creation failure#4184hutiefang76 wants to merge 3 commits into
hutiefang76 wants to merge 3 commits into
Conversation
Duansg
requested changes
Jul 8, 2026
| statement.setMaxRows(1000); | ||
| if (reuseConnection) { | ||
| JdbcConnect jdbcConnect = new JdbcConnect(connection); | ||
| connectionCommonCache.addCache(identifier, jdbcConnect); |
Member
There was a problem hiding this comment.
There is another issue here: when two threads access the same cache identifier simultaneously, addCache—because it is a non-atomic operation—may still cause a memory leak. For example: multiple monitoring tasks use the same URL. The connection being replaced may be silently overwritten without being closed.
Could you please add to or edit this section?
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.
What changed
This closes the new JDBC connection when statement creation or statement setup fails in
JdbcCommonCollect.The existing code closed cached JDBC connections on failure, but a freshly opened connection could remain open if
setReadOnly(true),createStatement(),setQueryTimeout(...), orsetMaxRows(...)threw before the method returned the statement. That path can leave PostgreSQLPgConnectioninstances waiting for finalization.Validation
JdbcCommonCollectTest#testCloseConnectionWhenCreateStatementFailsfailed becauseconnection.close()was not called.JAVA_HOME=$(/usr/libexec/java_home -v 26) ./mvnw -s <central-only-settings> -pl hertzbeat-collector/hertzbeat-collector-basic -am -Dtest=JdbcCommonCollectTest#testCloseConnectionWhenCreateStatementFails -Dsurefire.failIfNoSpecifiedTests=false -DfailIfNoTests=false testJAVA_HOME=$(/usr/libexec/java_home -v 26) ./mvnw -s <central-only-settings> -pl hertzbeat-collector/hertzbeat-collector-basic -am -Dtest=JdbcCommonCollectTest -Dsurefire.failIfNoSpecifiedTests=false -DfailIfNoTests=false testJAVA_HOME=$(/usr/libexec/java_home -v 26) ./mvnw -s <central-only-settings> -pl hertzbeat-collector/hertzbeat-collector-basic -am -Dsurefire.failIfNoSpecifiedTests=false -DfailIfNoTests=false testgit diff --checkFixes #4181