diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-18 22:14:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-18 22:14:29 +0000 |
| commit | cc529f382933ce1a8fa2e410fd993114bf419013 (patch) | |
| tree | d77ceffb96fcb04ac6065c9d7e7635fdc183aa3c | |
| parent | 5da12af683721255c67a1bfc00da00ffb7e90d40 (diff) | |
| parent | d594f62fd99623ee26134fa132bbb739d9e9de1c (diff) | |
| download | oslo-db-cc529f382933ce1a8fa2e410fd993114bf419013.tar.gz | |
Merge "Set max pool size default to 5"
| -rw-r--r-- | oslo_db/options.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/oslo_db/options.py b/oslo_db/options.py index 7742686..a02dad5 100644 --- a/oslo_db/options.py +++ b/oslo_db/options.py @@ -69,12 +69,13 @@ database_opts = [ help='Minimum number of SQL connections to keep open in a ' 'pool.'), cfg.IntOpt('max_pool_size', + default=5, deprecated_opts=[cfg.DeprecatedOpt('sql_max_pool_size', group='DEFAULT'), cfg.DeprecatedOpt('sql_max_pool_size', group='DATABASE')], help='Maximum number of SQL connections to keep open in a ' - 'pool.'), + 'pool. Setting a value of 0 indicates no limit.'), cfg.IntOpt('max_retries', default=10, deprecated_opts=[cfg.DeprecatedOpt('sql_max_retries', @@ -164,13 +165,12 @@ def set_defaults(conf, connection=None, sqlite_db=None, :type sqlite_db: str :keyword max_pool_size: maximum connections pool size. The size of the pool - to be maintained, defaults to 5, will be used if value of the parameter is - `None`. This is the largest number of connections that will be kept - persistently in the pool. Note that the pool begins with no connections; - once this number of connections is requested, that number of connections - will remain. + to be maintained, defaults to 5. This is the largest number of connections + that will be kept persistently in the pool. Note that the pool begins with + no connections; once this number of connections is requested, that number + of connections will remain. :type max_pool_size: int - :default max_pool_size: None + :default max_pool_size: 5 :keyword max_overflow: The maximum overflow size of the pool. When the number of checked-out connections reaches the size set in pool_size, |