opendev/gerrit
Code Issues Proposed changes

JdbcAccountPatchReviewStore: Add configurable settings to datasource

Browse Source 
So far, the datasource used to connect to the AccountPatchReviewStore
was using hard coded values for the pool connection settings. In high
traffic servers, those default values cause a bottleneck as the
transactions start to be queued when the max number of connections is
reached.

Add the possibility of specifying those values in the gerrit
configuration so they can be tailored to diverse needs.

Change-Id: I7d0cd1e2fe02cea3c5f78ef90398e9ac670a9a93
This commit is contained in:
Hector Oswaldo Caballero
2017-08-08 05:30:06 -04:00
parent 585e2b14d8
commit 8dead9663f
8 changed files with 134 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateAccountPatchReviewDb.java
View File

@@ -19,6 +19,7 @@ import com.google.common.base.Strings;
import com.google.gerrit.pgm.util.SiteProgram;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.config.ThreadSettingsConfig;
import com.google.gerrit.server.schema.DataSourceProvider;
import com.google.gerrit.server.schema.JdbcAccountPatchReviewStore;
import com.google.inject.Injector;
@@ -47,15 +48,17 @@ public class MigrateAccountPatchReviewDb extends SiteProgram {
@Override
public int run() throws Exception {
Injector dbInjector = createDbInjector(DataSourceProvider.Context.SINGLE_USER);
SitePaths sitePaths = new SitePaths(getSitePath());
ThreadSettingsConfig threadSettingsConfig = dbInjector.getInstance(ThreadSettingsConfig.class);
Config fakeCfg = new Config();
if (!Strings.isNullOrEmpty(sourceUrl)) {
fakeCfg.setString("accountPatchReviewDb", null, "url", sourceUrl);
}
JdbcAccountPatchReviewStore sourceJdbcAccountPatchReviewStore =
JdbcAccountPatchReviewStore.createAccountPatchReviewStore(fakeCfg, sitePaths);
JdbcAccountPatchReviewStore.createAccountPatchReviewStore(
fakeCfg, sitePaths, threadSettingsConfig);
Injector dbInjector = createDbInjector(DataSourceProvider.Context.SINGLE_USER);
Config cfg = dbInjector.getInstance(Key.get(Config.class, GerritServerConfig.class));
String targetUrl = cfg.getString("accountPatchReviewDb", null, "url");
if (targetUrl == null) {
@@ -64,7 +67,8 @@ public class MigrateAccountPatchReviewDb extends SiteProgram {
}
System.out.println("target Url: " + targetUrl);
JdbcAccountPatchReviewStore targetJdbcAccountPatchReviewStore =
JdbcAccountPatchReviewStore.createAccountPatchReviewStore(cfg, sitePaths);
JdbcAccountPatchReviewStore.createAccountPatchReviewStore(
cfg, sitePaths, threadSettingsConfig);
targetJdbcAccountPatchReviewStore.createTableIfNotExists();
if (!isTargetTableEmpty(targetJdbcAccountPatchReviewStore)) {