Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
Increase 'execution.defaultThreadPoolSize' default and min to 2
Fix formatting of submission IDs
Change-Id: Id8bb9ab54a11cf8a76ae5bbe5f13a23a9df0741a
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 419f440..41e76dc 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -4027,7 +4027,8 @@
The default size of the background execution thread pool in
which miscellaneous tasks are handled.
+
-Default is 1.
+Default and minimum is 2 so that a single, potentially longer executing
+task (e.g. GC), is not blocking the entire execution.
[[execution.fanOutThreadPoolSize]]execution.fanOutThreadPoolSize::
+
diff --git a/java/com/google/gerrit/server/git/WorkQueue.java b/java/com/google/gerrit/server/git/WorkQueue.java
index 0361117..f2a0ff1 100644
--- a/java/com/google/gerrit/server/git/WorkQueue.java
+++ b/java/com/google/gerrit/server/git/WorkQueue.java
@@ -95,7 +95,7 @@
@Inject
WorkQueue(IdGenerator idGenerator, @GerritServerConfig Config cfg, MetricMaker metrics) {
- this(idGenerator, cfg.getInt("execution", "defaultThreadPoolSize", 1), metrics);
+ this(idGenerator, Math.max(cfg.getInt("execution", "defaultThreadPoolSize", 2), 2), metrics);
}
/** Constructor to allow binding the WorkQueue more explicitly in a vhost setup. */
diff --git a/java/com/google/gerrit/server/logging/RequestId.java b/java/com/google/gerrit/server/logging/RequestId.java
index ceb5da0..543f0a2 100644
--- a/java/com/google/gerrit/server/logging/RequestId.java
+++ b/java/com/google/gerrit/server/logging/RequestId.java
@@ -72,6 +72,6 @@
}
public String toStringForStorage() {
- return str.substring(1, str.length() - 1);
+ return str;
}
}
