Skip to content

去除timeout默认值为10秒的逻辑 #5729 #5735

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

Merged
merged 1 commit into from
Feb 19, 2024
Merged

去除timeout默认值为10秒的逻辑 #5729 #5735

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
8 changes: 0 additions & 8 deletions core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,14 +825,6 @@ public void init() throws SQLException {
this.transactionIdSeedUpdater.addAndGet(this, delta);
}

if (connectTimeout == 0) {
connectTimeout = DEFAULT_TIME_CONNECT_TIMEOUT_MILLIS;
}

if (socketTimeout == 0) {
socketTimeout = DEFAULT_TIME_SOCKET_TIMEOUT_MILLIS;
}

if (this.jdbcUrl != null) {
this.jdbcUrl = this.jdbcUrl.trim();
initFromWrapDriverUrl();
Expand Down
19 changes: 17 additions & 2 deletions core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest10.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@ public void test_timeout_is_zero() throws Exception {
assertEquals(0, ds.getConnectTimeout());
assertEquals(0, ds.getSocketTimeout());
}

@Test
public void test_timeout_is_zero_default() throws Exception {
ds.setUrl("jdbc:mysql://127.0.0.1:3306/xxx");
ds.init();
assertEquals(0, ds.getConnectTimeout());
assertEquals(0, ds.getSocketTimeout());
}
@Test
public void test_timeout_is_zero2() throws Exception {
ds.setUrl("jdbc:mysql://127.0.0.1:3306/xxx");
Expand All @@ -61,17 +69,24 @@ public void test_timeout_is_zero2() throws Exception {

/**
* @throws Exception
* @see https://github.com/alibaba/druid/issues/5396
* @see <a href="https://github.com/alibaba/druid/issues/5396">...</a>
*/
@Test
public void test_timeout_in_loadbalance() throws Exception {
ds.setUrl(
"jdbc:mysql:loadbalance://localhost:3306,localhost:3310/test?connectTimeout=98&socketTimeout=99&loadBalanceConnectionGroup=first&ha.enableJMX=true");
ds.init();
assertEquals(98, ds.getConnectTimeout());
assertEquals(99, ds.getSocketTimeout());
}
@Test
public void test_timeout_is_zero_in_loadbalance() throws Exception {
ds.setUrl(
"jdbc:mysql:loadbalance://localhost:3306,localhost:3310/test?connectTimeout=0&socketTimeout=0&loadBalanceConnectionGroup=first&ha.enableJMX=true");
ds.init();
assertEquals(0, ds.getConnectTimeout());
assertEquals(0, ds.getSocketTimeout());
}

@Test
public void test_timeout_in_replication() throws Exception {
ds.setUrl(
Expand Down