Skip to content

依赖驱动自己设置socketTimeout，防止postgresql单位不一致等导致socketTimeout被覆盖 #6502

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

依赖驱动自己设置socketTimeout，防止postgresql单位不一致等导致socketTimeout被覆盖 #6502

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
12 changes: 0 additions & 12 deletions core/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1818,18 +1818,6 @@ public PhysicalConnectionInfo createPhysicalConnection() throws SQLException {
initPhysicalConnection(conn, variables, globalVariables);
initedNanos = System.nanoTime();

boolean skipSocketTimeout = "odps".equals(dbTypeName);
if (socketTimeout > 0 && !netTimeoutError && !skipSocketTimeout) {
try {
// As SQLServer-jdbc-driver 6.1.7 can use this, see https://github.com/microsoft/mssql-jdbc/wiki/SocketTimeout
conn.setNetworkTimeout(netTimeoutExecutor, socketTimeout); // here is milliseconds defined by JDBC
} catch (SQLFeatureNotSupportedException | AbstractMethodError e) {
netTimeoutError = true;
} catch (Exception ignored) {
// ignored
}
}

// call initSqls after completing socketTimeout setting.
if (!initSqls(conn, variables, globalVariables)) {
// if no SQL has been executed yet.
Expand Down