Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Java] Close connection during shutdown #557

Merged
merged 1 commit into from
Nov 5, 2024
Merged

[Java] Close connection during shutdown #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/DBConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ public static synchronized void closeAllConnections() {
}
}

static {
Runtime.getRuntime().addShutdownHook(new Thread(DBConnector::closeAllConnections));
}

public static void closeConn(Connection conn) {
if (conn != null) {
try {
Expand Down
6 changes: 3 additions & 3 deletions lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/DBUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ public static LinkedHashMap<String, String> parsePartitionDesc(String partitionD

public static void fillDataSourceConfig(HikariConfig config) {
config.setConnectionTimeout(10000);
config.setIdleTimeout(60000);
config.setMaximumPoolSize(8);
config.setKeepaliveTime(30000);
config.setIdleTimeout(30000);
config.setMaximumPoolSize(2);
config.setKeepaliveTime(10000);
config.setMinimumIdle(1);
config.addDataSourceProperty("cachePrepStmts", "true");
config.addDataSourceProperty("prepStmtCacheSize", "250");
Expand Down
4 changes: 4 additions & 0 deletions lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/jnr/NativeMetadataJavaClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package com.dmetasoul.lakesoul.meta.jnr;

import com.alibaba.fastjson.JSON;
import com.dmetasoul.lakesoul.meta.DBConnector;
import com.dmetasoul.lakesoul.meta.DBUtil;
import com.dmetasoul.lakesoul.meta.DataBaseProperty;
import com.dmetasoul.lakesoul.meta.entity.JniWrapper;
Expand Down Expand Up @@ -541,6 +542,9 @@ public static void closeAll() {
}
}

static {
java.lang.Runtime.getRuntime().addShutdownHook(new Thread(NativeMetadataJavaClient::closeAll));
}

/**
* if ffi function failed with -100
Expand Down
Loading