opendev/gerrit
Code Issues Proposed changes

Merge "Change default value of database.poolMaxIdle"

Browse Source
This commit is contained in:
Martin Fick
2015-11-23 22:34:23 +00:00
committed by Gerrit Code Review
parent 6aefc53f67 30d70aef09
commit df384d5b75
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config-gerrit.txt
View File

@@ -1423,7 +1423,7 @@ This setting only applies if
Maximum number of connections to keep idle in the pool. If there Maximum number of connections to keep idle in the pool. If there
are more idle connections, connections will be closed instead of are more idle connections, connections will be closed instead of
being returned back to the pool. being returned back to the pool.
Default is 4. Default is min(<<database.poolLimit, database.poolLimit>>, 16).
+ +
This setting only applies if This setting only applies if
<<database.connectionPool,database.connectionPool>> is true. <<database.connectionPool,database.connectionPool>> is true.

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

@@ -129,9 +129,11 @@ public class DataSourceProvider implements Provider<DataSource>,
if (password != null && !password.isEmpty()) { if (password != null && !password.isEmpty()) {
ds.setPassword(password); ds.setPassword(password);
} }
ds.setMaxActive(threadSettingsConfig.getDatabasePoolLimit()); int poolLimit = threadSettingsConfig.getDatabasePoolLimit();
ds.setMaxActive(poolLimit);
ds.setMinIdle(cfg.getInt("database", "poolminidle", 4)); ds.setMinIdle(cfg.getInt("database", "poolminidle", 4));
ds.setMaxIdle(cfg.getInt("database", "poolmaxidle", 4)); ds.setMaxIdle(
cfg.getInt("database", "poolmaxidle", Math.min(poolLimit, 16)));
ds.setMaxWait(ConfigUtil.getTimeUnit(cfg, "database", null, ds.setMaxWait(ConfigUtil.getTimeUnit(cfg, "database", null,
"poolmaxwait", MILLISECONDS.convert(30, SECONDS), MILLISECONDS)); "poolmaxwait", MILLISECONDS.convert(30, SECONDS), MILLISECONDS));
ds.setInitialSize(ds.getMinIdle()); ds.setInitialSize(ds.getMinIdle());