Update sample SQL module config now all drivers use trunks

diff --git a/raddb/mods-available/sql b/raddb/mods-available/sql
index c665e8ebe146d1bcf47d7e9ad170e776d658b45a..80475c6d2efe906618bceaa08f0ef521ce9af1c2 100644 (file)
--- a/raddb/mods-available/sql
+++ b/raddb/mods-available/sql
@@ -201,35 +201,19 @@ sql {
        #
        #  pool { ... }::
        #
-       #  The connection pool is new for 3.0, and will be used in many modules, for all kinds of
-       #  connection-related activity.
-       #
-       #  When the server is not threaded, the connection pool limits are ignored, and only one
-       #  connection is used.
-       #
-       #  [NOTE]
-       #  ====
-       #  If you want to have multiple SQL modules reuse the same connection pool, use `pool = name`
-       #  instead of a `pool` section.
-       #
-       #  e.g:
-       #
-       #  [source,sql]
-       #  ----
-       #  sql sql1 {
-       #   ...
-       #   pool {
-       #     ...
-       #   }
-       #  }
-       #
-       #  # sql2 will use the connection pool from sql1
-       #  sql sql2 {
-       #   ...
-       #   pool = sql1
-       #  }
-       #  ----
-       #  ====
+       #  The connection pool is a set of per-thread parameters for connections to the SQL database.
+       #
+       #  If the driver supports it, then queries are run asynchronously.  Currently the list of
+       #  drivers this applies to is:
+       #
+       #     * mysql
+       #     * postgresql
+       #     * unixodbc
+       #     * oracle
+       #     * cassandra
+       #
+       #  Other drivers are synchronous and therefore queries will block packet processing, resulting
+       #  in significantly worse system performance.
        #
        pool {
                #
@@ -245,7 +229,7 @@ sql {
                #
                #  min:: Minimum number of connections to keep open.
                #
-               min = 0
+               min = 1
 
                #
                #  max:: Maximum number of connections.
@@ -253,25 +237,23 @@ sql {
                #  If these connections are all in use and a new one
                #  is requested, the request will NOT get a connection.
                #
-               #  Setting `max` to *LESS* than the number of threads means
-               #  that some threads may starve, and you will see errors
-               #  like _No connections available and at max connection limit_.
+               #  Since the majority of SQL drivers only allow one outstanding
+               #  query per connection, this represents the maximum number of
+               #  simultaneous packets that a thread can process.
                #
-               #  Setting `max` to MORE than the number of threads means
-               #  that there are more connections than necessary.
+               #  Note: The maximum number of connections from FreeRADIUS to
+               #  the database will be this number multiplied by the number of
+               #  worker threads.  Ensure that the database server supports that
+               #  number of connections.
                #
-               #  If `max` is not specified, then it defaults to the number
-               #  of workers configured.
-               #
-#              max =
+               max = 100
 
                #
-               #  spare:: Spare connections to be left idle.
+               #  connecting:: Number of connections which can be starting at once
                #
-               #  NOTE: Idle connections WILL be closed if `idle_timeout`
-               #  is set.  This should be less than or equal to `max` above.
+               #  Used to throttle connection spawning.
                #
-               spare = 1
+               connecting = 2
 
                #
                #  uses:: Number of uses before the connection is closed.
@@ -280,54 +262,47 @@ sql {
                #
                uses = 0
 
-               #
-               #  retry_delay:: The number of seconds to wait after the server tries
-               #  to open a connection, and fails.
-               #
-               #  During this time, no new connections will be opened.
-               #
-               retry_delay = 30
-
                #
                #  lifetime:: The lifetime (in seconds) of the connection.
                #
                lifetime = 0
 
                #
-               #  idle_timeout:: idle timeout (in seconds).
-               #
-               #  A connection which is unused for this length of time will be closed.
+               #  open_delay:: Open delay (in seconds).
                #
-               idle_timeout = 60
+               #  How long must we be above the target utilisation for connections to be opened.
+#              open_delay = 0.2
 
                #
-               #  connect_timeout:: Connection timeout (in seconds).
+               #  close_delay:: Close delay (in seconds).
                #
-               #  The maximum amount of time to wait for a new connection to be established.
+               #  How long we must be below the target utilisation for connections to be closed
                #
-               #  Not supported by:
+#              close_delay = 10
+
                #
-               #  [options="header,autowidth"]
-               #  |===
-               #  | Driver     | Description
-               #  | firebird   | Likely possible but no documentation.
-               #  | oracle     | Not possible.
-               #  | postgresql | Should be set via the radius_db string instead.
-               #  |===
+               #  manage_interval:: How often to manage the connection pool.
                #
-               connect_timeout = 3.0
+#              manage_interval = 0.2
 
                #
-               #  [NOTE]
-               #  ====
-               #  * All configuration settings are enforced.  If a connection is closed because
-               #  of `idle_timeout`, `uses`, or `lifetime`, then the total number of connections
-               #  MAY fall below `min`.
-               #  When that happens, it will open a new connection.  It will also log a WARNING message.
+               #  request:: Options specific to requests handled by this connection pool
                #
-               #  * The solution is to either lower the "min" connections, or increase lifetime/idle_timeout.
-               #  ====
+               #  Note:  Due to the one outstanding query per connection limit, the settings
+               #  `per_connection_max` and `per_connection_target` are forcibly set to 1 for
+               #  SQL database connections.
                #
+               request {
+
+                       #
+                       #  free_delay:: How long must a request in the unassigned (free) list not have been
+                       #  used for before it's cleaned up and actually freed.
+                       #
+                       #  Unassigned requests can be re-used, multiple times, reducing memory allocation
+                       #  and freeing overheads.
+                       #
+#                      free_delay = 10
+               }
        }
 
        #