new-repo: added config options for keepaliveTime+leakDetectionThreshold

Both are directly passed to HikariCP if set. Old repo doesn't use it.
Evolveum · Oct 21, 2021 · edf5879 · edf5879
1 parent 031c2ed
commit edf5879
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/...po-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryConfiguration.java b/...po-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryConfiguration.java
@@ -67,11 +67,13 @@ public class SqaleRepositoryConfiguration implements JdbcRepositoryConfiguration
 
     private String driverClassName;
 
+    private long initializationFailTimeout;
     private int minPoolSize;
     private int maxPoolSize;
     private Long maxLifetime;
     private Long idleTimeout;
-    private long initializationFailTimeout;
+    private Long keepaliveTime;
+    private Long leakDetectionThreshold;
 
     private String fullObjectFormat;
 
@@ -114,6 +116,10 @@ public void init() throws RepositoryServiceFactoryException {
         minPoolSize = configuration.getInt(PROPERTY_MIN_POOL_SIZE, Math.min(DEFAULT_MIN_POOL_SIZE, maxPoolSize));
         maxLifetime = configuration.getLong(PROPERTY_MAX_LIFETIME, null);
         idleTimeout = configuration.getLong(PROPERTY_IDLE_TIMEOUT, null);
+        keepaliveTime = configuration.getLong(PROPERTY_KEEPALIVE_TIME, null);
+        // 0 to disable, which is also HikariCP default
+        leakDetectionThreshold = configuration.getLong(PROPERTY_LEAK_DETECTION_THRESHOLD, null);
+        // 1ms is also HikariCP default, we use "long" for it so it must be set
         initializationFailTimeout = configuration.getLong(PROPERTY_INITIALIZATION_FAIL_TIMEOUT, 1L);
 
         fullObjectFormat = configuration.getString(PROPERTY_FULL_OBJECT_FORMAT, DEFAULT_FULL_OBJECT_FORMAT)
@@ -251,6 +257,16 @@ public long getInitializationFailTimeout() {
         return initializationFailTimeout;
     }
 
+    @Override
+    public Long getKeepaliveTime() {
+        return keepaliveTime;
+    }
+
+    @Override
+    public Long getLeakDetectionThreshold() {
+        return leakDetectionThreshold;
+    }
+
     @Override
     public String getPerformanceStatisticsFile() {
         return performanceStatisticsFile;

diff --git a/repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/DataSourceFactory.java b/repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/DataSourceFactory.java
@@ -93,10 +93,15 @@ private HikariConfig createHikariConfig(String applicationName) {
         if (configuration.getMaxLifetime() != null) {
             config.setMaxLifetime(configuration.getMaxLifetime());
         }
-
         if (configuration.getIdleTimeout() != null) {
             config.setIdleTimeout(configuration.getIdleTimeout());
         }
+        if (configuration.getKeepaliveTime() != null) {
+            config.setKeepaliveTime(configuration.getKeepaliveTime());
+        }
+        if (configuration.getLeakDetectionThreshold() != null) {
+            config.setLeakDetectionThreshold(configuration.getLeakDetectionThreshold());
+        }
 
         config.setIsolateInternalQueries(true);
 

diff --git a/...sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/JdbcRepositoryConfiguration.java b/...sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/JdbcRepositoryConfiguration.java
@@ -25,6 +25,8 @@ public interface JdbcRepositoryConfiguration {
     String PROPERTY_MAX_POOL_SIZE = "maxPoolSize";
     String PROPERTY_MAX_LIFETIME = "maxLifetime";
     String PROPERTY_IDLE_TIMEOUT = "idleTimeout";
+    String PROPERTY_KEEPALIVE_TIME = "keepaliveTime";
+    String PROPERTY_LEAK_DETECTION_THRESHOLD = "leakDetectionThreshold";
     String PROPERTY_INITIALIZATION_FAIL_TIMEOUT = "initializationFailTimeout";
 
     String PROPERTY_USE_ZIP = "useZip";
@@ -76,12 +78,19 @@ default String getReadOnlyTransactionStatement() {
         return null;
     }
 
+    // For HikariCP config see: https://github.com/brettwooldridge/HikariCP#gear-configuration-knobs-baby
+    // All times are in ms.
     long getInitializationFailTimeout();
-
     int getMinPoolSize();
     int getMaxPoolSize();
     Long getMaxLifetime();
     Long getIdleTimeout();
+    default Long getKeepaliveTime() {
+        return null;
+    }
+    default Long getLeakDetectionThreshold() {
+        return null;
+    }
 
     boolean isUseZip();
     boolean isUseZipAudit();