From 4b5a416b4927e30cb095bc67976d365ad9d2e487 Mon Sep 17 00:00:00 2001 From: Dariusz Luksza Date: Mon, 9 Nov 2015 21:53:29 +0100 Subject: [PATCH] Change how default value of sshd.threads is computed Increase multiplier used to compute sshd.threads from 1.5 to 2. This way more ssh connections can be handled by default by gerrit. Gerrit SSH channel is not only used by human users but also by bots like CI and monitoring servers (eg. frequently checking caches and/or queues of Gerrit). Change-Id: If018ae277ae2218309f5f9c60ca522b5dd2a2c5c Signed-off-by: Dariusz Luksza --- Documentation/config-gerrit.txt | 2 +- .../com/google/gerrit/server/config/ThreadSettingsConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index 97de8dfb14..65dca948c2 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -3410,7 +3410,7 @@ Number of threads to use when executing SSH command requests. If additional requests are received while all threads are busy they are queued and serviced in a first-come-first-served order. + -By default, 1.5x the number of CPUs available to the JVM. +By default, 2x the number of CPUs available to the JVM. [[sshd.batchThreads]]sshd.batchThreads:: + diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ThreadSettingsConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ThreadSettingsConfig.java index d88a2bd6b4..c62583e341 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ThreadSettingsConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ThreadSettingsConfig.java @@ -29,7 +29,7 @@ public class ThreadSettingsConfig { @Inject ThreadSettingsConfig(@GerritServerConfig Config cfg) { int cores = Runtime.getRuntime().availableProcessors(); - sshdThreads = cfg.getInt("sshd", "threads", 3 * cores / 2); + sshdThreads = cfg.getInt("sshd", "threads", 2 * cores); httpdMaxThreads = cfg.getInt("httpd", "maxThreads", 25); int defaultDatabasePoolLimit = sshdThreads + httpdMaxThreads + 2; databasePoolLimit =