Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Allow to configure the number of hook execution workers
Change-Id: I1b7d98d9347a5d59c7316a1dc301211ccd967add
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/HookQueue.java b/src/main/java/com/googlesource/gerrit/plugins/hooks/HookQueue.java
index 88ae311..50ba975 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/HookQueue.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/hooks/HookQueue.java
@@ -16,21 +16,25 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.extensions.events.LifecycleListener;
+import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.git.WorkQueue;
import com.google.inject.Inject;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.ScheduledExecutorService;
+import org.eclipse.jgit.lib.Config;
class HookQueue implements LifecycleListener {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final WorkQueue workQueue;
+ private final int executorThreads;
private ScheduledExecutorService queue;
@Inject
- HookQueue(WorkQueue workQueue) {
+ HookQueue(WorkQueue workQueue, @GerritServerConfig Config config) {
+ this.executorThreads = config.getInt("hooks", "executorThreads", 1);
this.workQueue = workQueue;
}
@@ -48,7 +52,7 @@
@Override
public void start() {
- queue = workQueue.createQueue(1, "HookQueue");
+ queue = workQueue.createQueue(executorThreads, "HookQueue");
}
@Override
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index 9303587..2aea566 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -37,6 +37,9 @@
: Timeout value in seconds for synchronous hooks. If not set, defaults
to 30 seconds.
+hooks.executorThreads
+: Number of workers to use for hook execution. If not set, defaults to 1.
+
hooks.changeAbandonedHook
: Filename for the change abandoned hook. If not set, defaults to `change-abandoned`.
