opendev/gerrit
Code Issues Proposed changes

DataSourceProvider: Validate connection

Browse Source 
So far, when sending a request to the database, it was possible to try to
reuse an already closed connection which resulted in a 500 error.

Validate connections are still valid when they are borrowed and returned
to the connection pool.

Change-Id: I3376c872f6183ff7392ca2c8e354ed71a481ce0f
This commit is contained in:
Hector Oswaldo Caballero
2018-08-01 07:07:45 -04:00
parent 3a6f64f5e3
commit ea1230d4ad
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);