summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorShawn Pearce <sop@google.com>2013-05-06 10:00:44 -0700
committerShawn Pearce <sop@google.com>2013-05-06 10:00:44 -0700
commit5348e0fa25f7c8b32a5cc23dacd606f16a9a3df3 (patch)
tree861e882e75feede92c329c773ee4c4cb44b723ec /Documentation
parent17ad1de4342229d94ef34a53f5306013bcf4b193 (diff)
parentd332cf59ed672a4bd2b7bfa8d4d225b9c09f61bc (diff)
Merge branch 'stable-2.6'
* stable-2.6: Add documentation for database.connectionPool setting
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config-gerrit.txt19
1 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 42a9c7a0f4..3591c7793f 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -1049,6 +1049,13 @@ database.type or database.url for any supported database.
isn't necessary as it can be constructed from the all of the
above properties.
+[[database.connectionPool]]database.connectionPool::
++
+If true, use connection pooling for database connections. Otherwise, a
+new database connection is opened for each request.
++
+Default is false for MySQL, and true for other database backends.
+
[[database.poolLimit]]database.poolLimit::
+
Maximum number of open database connections. If the server needs
@@ -1060,11 +1067,17 @@ httpd and sshd threads as some request processing code paths may
need multiple connections.
+
Default is 8.
++
+This setting only applies if
+<<database.connectionPool,database.connectionPool>> is true.
[[database.poolMinIdle]]database.poolMinIdle::
+
Minimum number of connections to keep idle in the pool.
Default is 4.
++
+This setting only applies if
+<<database.connectionPool,database.connectionPool>> is true.
[[database.poolMaxIdle]]database.poolMaxIdle::
+
@@ -1072,6 +1085,9 @@ Maximum number of connections to keep idle in the pool. If there
are more idle connections, connections will be closed instead of
being returned back to the pool.
Default is 4.
++
+This setting only applies if
+<<database.connectionPool,database.connectionPool>> is true.
[[database.poolMaxWait]]database.poolMaxWait::
+
@@ -1090,6 +1106,9 @@ Values should use common unit suffixes to express their setting:
If a unit suffix is not specified, `milliseconds` is assumed.
+
Default is `30 seconds`.
++
+This setting only applies if
+<<database.connectionPool,database.connectionPool>> is true.
[[download]]Section download
~~~~~~~~~~~~~~~~~~~~~~~~~~~~