opendev/gerrit
Code Issues Proposed changes

Fix LDAP connection pool configuration.

Browse Source 
Commit cd04bbc1 introduced LDAP connection pooling but it made a wrong
assumption that connection pool settings can be provided as env
variables.

According to [1] and also [2] the LDAP connection pool configuration is
done via JVM system properties. Only "com.sun.jndi.ldap.connect.pool" is
specified as an env variable.

[1] http://docs.oracle.com/javase/7/docs/technotes/guides/jndi/jndi-ldap.html#POOL
[2] http://stackoverflow.com/questions/22411967/which-ldap-jndi-provider-pool-settings-are-system-properties-and-which-are-envi

Change-Id: I71eb1934a23d658a1801afcd125895c59b69581e
This commit is contained in:
Saša Živkov
2015-01-19 17:04:43 +01:00
committed by Edwin Kempin
parent 303701adaa
commit 5049f5123b
2 changed files with 20 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Documentation/config-gerrit.txt
View File

@@ -2505,64 +2505,22 @@ etc...
+
By default there is no timeout and Gerrit will wait indefinitely.
[[ldap.poolAuthentication]]ldap.poolAuthentication::
+
_(Optional)_ A list of space-separated authentication types of
connections that may be pooled. Valid types are "none", "simple",
and "DIGEST-MD5".
+
Default is "none simple".
[[ldap-connection-pooling]]
==== LDAP Connection Pooling
Once LDAP connection pooling is enabled by setting the link:#ldap.useConnectionPooling[
ldap.useConnectionPooling] configuration property to `true`, the connection pool
can be configured using JVM system properties as explained in the
link:http://docs.oracle.com/javase/7/docs/technotes/guides/jndi/jndi-ldap.html#POOL[
Java SE Documentation].
[[ldap.poolDebug]]ldap.poolDebug::
+
_(Optional)_ A string that indicates the level of debug output
to produce. Valid values are "fine" (trace connection creation
and removal) and "all" (all debugging information).
For standalone Gerrit (running with the embedded Jetty), JVM system properties
are specified in the link:#container[container section]:
[[ldap.poolInitsize]]ldap.poolInitsize::
+
_(Optional)_ The string representation of an integer that
represents the number of connections per connection identity
to create when initially creating a connection for the identity.
+
Default is 1.
[[ldap.poolMaxsize]]ldap.poolMaxsize::
+
_(Optional)_ The string representation of an integer that
represents the maximum number of connections per connection
identity that can be maintained concurrently.
+
Default is 0, means that there is no maximum size: A request for
a pooled connection will use an existing pooled idle connection
or a newly created pooled connection.
[[ldap.poolPrefsize]]ldap.poolPrefsize::
+
_(Optional)_ The string representation of an integer that
represents the preferred number of connections per connection
identity that should be maintained concurrently.
+
Default is 0, means that there is no preferred size: A request
for a pooled connection will result in a newly created connection
only if no idle ones are available.
[[ldap.poolProtocol]]ldap.poolProtocol::
+
_(Optional)_ A list of space-separated protocol types of
connections that may be pooled. Valid types are "plain" and "ssl".
+
Default is "plain".
[[ldap.poolTimeout]]ldap.poolTimeout::
+
_(Optional)_ Specify how long an idle connection may remain
in the pool without being closed and removed from the pool.
+
The value is in the usual time-unit format like "1 s", "100 ms",
etc...
+
By default there is no timeout.
----
javaOptions = -Dcom.sun.jndi.ldap.connect.pool.maxsize=20
javaOptions = -Dcom.sun.jndi.ldap.connect.pool.prefsize=10
javaOptions = -Dcom.sun.jndi.ldap.connect.pool.timeout=300000
----
[[mimetype]]
=== Section mimetype