[branch-2.1][fix](jdbc catalog) Fix Memory Leak by Enabling Weak Refe…

…rences in HikariCP (#39833) pick(#39582)
apache · Aug 23, 2024 · 4cb7122 · 4cb7122
1 parent 00e4f34
commit 4cb7122
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java
@@ -93,6 +93,7 @@ public BaseJdbcExecutor(byte[] thriftParams) throws Exception {
  .setConnectionPoolMaxLifeTime(request.connection_pool_max_life_time)
  .setConnectionPoolKeepAlive(request.connection_pool_keep_alive);
  JdbcDataSource.getDataSource().setCleanupInterval(request.connection_pool_cache_clear_time);
+ System.setProperty("com.zaxxer.hikari.useWeakReferences", "true");
  init(config, request.statement);
  this.jdbcDriverVersion = getJdbcDriverVersion();
  }
@@ -308,7 +309,7 @@ private void init(JdbcDataSourceConfig config, String sql) throws JdbcExecutorEx
  ds.setKeepaliveTime(config.getConnectionPoolMaxLifeTime() / 5L); // default 6 min
  }
  hikariDataSource = ds;
- JdbcDataSource.getDataSource().putSource(hikariDataSourceKey, ds);
+ JdbcDataSource.getDataSource().putSource(hikariDataSourceKey, hikariDataSource);
  LOG.info("JdbcClient set"
  + " ConnectionPoolMinSize = " + config.getConnectionPoolMinSize()
  + ", ConnectionPoolMaxSize = " + config.getConnectionPoolMaxSize()

diff --git a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcDataSource.java b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcDataSource.java
@@ -59,8 +59,10 @@ public Map<String, HikariDataSource> getSourcesMap() {
  }
 
  public void setCleanupInterval(long interval) {
- this.cleanupInterval = interval * 1000L;
- restartCleanupTask();
+ if (this.cleanupInterval != interval * 1000L) {
+ this.cleanupInterval = interval * 1000L;
+ restartCleanupTask();
+ }
  }
 
  private synchronized void restartCleanupTask() {