pgm: Add utility for limiting threads based on DB pool size
Change-Id: Ia398bd289996c1010d7c487246c791f970ddfa89
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
index 62896ea..dae11b4 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
@@ -30,6 +30,7 @@
import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.gerrit.lucene.LuceneIndexModule;
import com.google.gerrit.pgm.util.SiteProgram;
+import com.google.gerrit.pgm.util.ThreadLimiter;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -74,8 +75,6 @@
import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.project.SectionSortCache;
import com.google.gerrit.server.query.change.ChangeData;
-import com.google.gerrit.server.schema.DataSourceProvider;
-import com.google.gerrit.server.schema.DataSourceType;
import com.google.gerrit.solr.SolrIndexModule;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
@@ -95,8 +94,6 @@
import org.eclipse.jgit.lib.TextProgressMonitor;
import org.eclipse.jgit.util.io.NullOutputStream;
import org.kohsuke.args4j.Option;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.Collections;
import java.util.List;
@@ -104,8 +101,6 @@
import java.util.concurrent.TimeUnit;
public class Reindex extends SiteProgram {
- private static final Logger log = LoggerFactory.getLogger(Reindex.class);
-
@Option(name = "--threads", usage = "Number of threads to use for indexing")
private int threads = Runtime.getRuntime().availableProcessors();
@@ -133,7 +128,7 @@
public int run() throws Exception {
mustHaveValidSite();
dbInjector = createDbInjector(MULTI_USER);
- limitThreads();
+ threads = ThreadLimiter.limitThreads(dbInjector, threads);
disableLuceneAutomaticCommit();
if (version == null) {
version = ChangeSchemas.getLatest().getVersion();
@@ -162,20 +157,6 @@
return result;
}
- private void limitThreads() {
- Config cfg =
- dbInjector.getInstance(Key.get(Config.class, GerritServerConfig.class));
- boolean usePool = cfg.getBoolean("database", "connectionpool",
- dbInjector.getInstance(DataSourceType.class).usePool());
- int poolLimit = cfg.getInt("database", "poollimit",
- DataSourceProvider.DEFAULT_POOL_LIMIT);
- if (usePool && threads > poolLimit) {
- log.warn("Limiting reindexing to " + poolLimit
- + " threads due to database.poolLimit");
- threads = poolLimit;
- }
- }
-
private Injector createSysInjector() {
List<Module> modules = Lists.newArrayList();
modules.add(PatchListCacheImpl.module());
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ThreadLimiter.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ThreadLimiter.java
new file mode 100644
index 0000000..44361aa
--- /dev/null
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ThreadLimiter.java
@@ -0,0 +1,55 @@
+// Copyright (C) 2014 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.pgm.util;
+
+import com.google.gerrit.server.config.GerritServerConfig;
+import com.google.gerrit.server.schema.DataSourceProvider;
+import com.google.gerrit.server.schema.DataSourceType;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+
+import org.eclipse.jgit.lib.Config;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+// TODO(dborowitz): Not necessary once we switch to notedb.
+/** Utility to limit threads used by a batch program. */
+public class ThreadLimiter {
+ private static final Logger log =
+ LoggerFactory.getLogger(ThreadLimiter.class);
+
+ public static int limitThreads(Injector dbInjector, int threads) {
+ return limitThreads(
+ dbInjector.getInstance(Key.get(Config.class, GerritServerConfig.class)),
+ dbInjector.getInstance(DataSourceType.class),
+ threads);
+ }
+
+ private static int limitThreads(Config cfg, DataSourceType dst, int threads) {
+ boolean usePool = cfg.getBoolean("database", "connectionpool",
+ dst.usePool());
+ int poolLimit = cfg.getInt("database", "poollimit",
+ DataSourceProvider.DEFAULT_POOL_LIMIT);
+ if (usePool && threads > poolLimit) {
+ log.warn("Limiting program to " + poolLimit
+ + " threads due to database.poolLimit");
+ return poolLimit;
+ }
+ return threads;
+ }
+
+ private ThreadLimiter() {
+ }
+}
