opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  DataSourceProvider: Validate connection
  Set version to 2.14.12-SNAPSHOT

Change-Id: Ic5072f697da22e9e5a520298a194d4bccc21d224
This commit is contained in:
David Pursehouse
2018-08-01 16:55:37 +02:00
parent 33386a35b3 ea1230d4ad
commit 0bf73a6963
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java
View File

@@ -141,6 +141,8 @@ public class DataSourceProvider implements Provider<DataSource>, LifecycleListen
long evictIdleTimeMs = 1000L * 60; long evictIdleTimeMs = 1000L * 60;
ds.setMinEvictableIdleTimeMillis(evictIdleTimeMs); ds.setMinEvictableIdleTimeMillis(evictIdleTimeMs);
ds.setTimeBetweenEvictionRunsMillis(evictIdleTimeMs / 2); ds.setTimeBetweenEvictionRunsMillis(evictIdleTimeMs / 2);
ds.setTestOnBorrow(true);
ds.setTestOnReturn(true);
ds.setValidationQuery(dst.getValidationQuery()); ds.setValidationQuery(dst.getValidationQuery());
ds.setValidationQueryTimeout(5); ds.setValidationQueryTimeout(5);
exportPoolMetrics(ds); exportPoolMetrics(ds);