openstack/oslo.db
Code Issues Proposed changes

Remove the sql_max_pool_size option.

Browse Source 
The option was replaced 6 years ago[1] by max_pool_size.

[1] 1b7c295d52

Change-Id: Ice1a90edc32603c85449b80fe78fd437aa7e8081
This commit is contained in:
Daniel Bengtsson 2021-03-03 13:59:51 +01:00
parent 9119edc86f
commit 94141edc5b
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oslo_db/options.py
View File

@ -69,10 +69,6 @@ database_opts = [
'the pool.'), 'the pool.'),
cfg.IntOpt('max_pool_size', cfg.IntOpt('max_pool_size',
default=5, 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 ' help='Maximum number of SQL connections to keep open in a '
'pool. Setting a value of 0 indicates no limit.'), 'pool. Setting a value of 0 indicates no limit.'),
cfg.IntOpt('max_retries', cfg.IntOpt('max_retries',

4
oslo_db/tests/sqlalchemy/test_options.py
View File

@ -30,7 +30,6 @@ class DbApiOptionsTestCase(test_utils.BaseTestCase):
def test_deprecated_session_parameters(self): def test_deprecated_session_parameters(self):
path = self.create_tempfiles([["tmp", b"""[DEFAULT] path = self.create_tempfiles([["tmp", b"""[DEFAULT]
sql_connection=x://y.z sql_connection=x://y.z
sql_max_pool_size=20
sql_max_retries=30 sql_max_retries=30
sql_retry_interval=40 sql_retry_interval=40
sql_max_overflow=50 sql_max_overflow=50
@ -39,7 +38,6 @@ sql_connection_trace=True
"""]])[0] """]])[0]
self.conf(['--config-file', path]) self.conf(['--config-file', path])
self.assertEqual('x://y.z', self.conf.database.connection) self.assertEqual('x://y.z', self.conf.database.connection)
self.assertEqual(20, self.conf.database.max_pool_size)
self.assertEqual(30, self.conf.database.max_retries) self.assertEqual(30, self.conf.database.max_retries)
self.assertEqual(40, self.conf.database.retry_interval) self.assertEqual(40, self.conf.database.retry_interval)
self.assertEqual(50, self.conf.database.max_overflow) self.assertEqual(50, self.conf.database.max_overflow)
@ -71,7 +69,6 @@ pool_timeout=7
path = self.create_tempfiles([['tmp', b'[DATABASE]\n' path = self.create_tempfiles([['tmp', b'[DATABASE]\n'
b'sql_connection=fake_connection\n' b'sql_connection=fake_connection\n'
b'sql_idle_timeout=100\n' b'sql_idle_timeout=100\n'
b'sql_max_pool_size=199\n'
b'sql_max_retries=22\n' b'sql_max_retries=22\n'
b'reconnect_interval=17\n' b'reconnect_interval=17\n'
b'sqlalchemy_max_overflow=101\n' b'sqlalchemy_max_overflow=101\n'
@ -81,7 +78,6 @@ pool_timeout=7
self.assertEqual('fake_connection', self.conf.database.connection) self.assertEqual('fake_connection', self.conf.database.connection)
self.assertEqual(100, self.conf.database.connection_recycle_time) self.assertEqual(100, self.conf.database.connection_recycle_time)
self.assertEqual(100, self.conf.database.idle_timeout) self.assertEqual(100, self.conf.database.idle_timeout)
self.assertEqual(199, self.conf.database.max_pool_size)
self.assertEqual(22, self.conf.database.max_retries) self.assertEqual(22, self.conf.database.max_retries)
self.assertEqual(17, self.conf.database.retry_interval) self.assertEqual(17, self.conf.database.retry_interval)
self.assertEqual(101, self.conf.database.max_overflow) self.assertEqual(101, self.conf.database.max_overflow)

4
releasenotes/notes/removed-deprecated-sql-max-pool-size-c9b7bfc14c3b6b14.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Removed deprecated database option ``sql_max_pool_size``.