opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  Fix typo in waitTimeout configuration and clarify its use
  Fix LogFileCompressor scheduling
  SshDaemon: introduce sshd.waitTimeout to set WAIT_FOR_SPACE_TIMEOUT
  Document max number of concurrent Git requests over SSH and HTTP

Change-Id: Ia398c1d62ef98edc0b8db99e31be1bd4c01f4ecf
This commit is contained in:
David Pursehouse
2017-10-17 08:12:48 +09:00
parent 40125966e1 6d7c681f53
commit 96a7dd71dc
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Documentation/config-gerrit.txt
View File

@@ -2546,6 +2546,12 @@ By default, 5, suitable for most lower-volume traffic sites.
Maximum number of threads to permit in the worker thread pool.
+
By default 25, suitable for most lower-volume traffic sites.
+
[NOTE]
Unless SSH daemon is disabled, see <<sshd.listenAddress, sshd.listenAddress>>,
the max number of concurrent Git requests over HTTP and SSH together is
defined by the <<sshd.threads, sshd.threads>> and
<<sshd.batchThreads, sshd.batchThreads>>.
[[httpd.maxQueued]]httpd.maxQueued::
+
@@ -4143,6 +4149,10 @@ If additional requests are received while all threads are busy they
are queued and serviced in a first-come-first-served order.
+
By default, 2x the number of CPUs available to the JVM.
+
[NOTE]
When SSH daemon is enabled then this setting also defines the max number of
concurrent Git requests for interactive users over SSH and HTTP together.
[[sshd.batchThreads]]sshd.batchThreads::
+
@@ -4161,6 +4171,10 @@ than the total number of threads allocated in sshd.threads, then the
value of sshd.threads is increased to accommodate the requested value.
+
By default is 1 on single core node, 2 otherwise.
+
[NOTE]
When SSH daemon is enabled then this setting also defines the max number of
concurrent Git requests for batch users over SSH and HTTP together.
[[sshd.streamThreads]]sshd.streamThreads::
+
@@ -4206,8 +4220,9 @@ By default, 2 minutes.
[[sshd.idleTimeout]]sshd.idleTimeout::
+
Time in seconds after which the server automatically terminates idle
connections (or 0 to disable closing of idle connections). Values
should use common unit suffixes to express their setting:
connections (or 0 to disable closing of idle connections) not waiting for
any server operation to complete.
Values should use common unit suffixes to express their setting:
+
* s, sec, second, seconds
* m, min, minute, minutes
@@ -4217,6 +4232,21 @@ should use common unit suffixes to express their setting:
+
By default, 0.
[[sshd.waitTimeout]]sshd.waitTimeout::
+
Time in seconds after which the server automatically terminates
connections waiting for a server operation to complete, like for instance
cloning a very large repo with lots of refs.
Values should use common unit suffixes to express their setting:
+
* s, sec, second, seconds
* m, min, minute, minutes
* h, hr, hour, hours
* d, day, days
+
By default, 30s.
[[sshd.maxConnectionsPerUser]]sshd.maxConnectionsPerUser::
+
Maximum number of concurrent SSH sessions that a user account