diff options
| author | Zuul <zuul@review.opendev.org> | 2021-05-03 12:34:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-05-03 12:34:27 +0000 |
| commit | 78d12d76969730d25f81b069b1b40730b91bd62f (patch) | |
| tree | 64782ae18478086f2be8ea9d1528ecc03e3f3a11 /oslo_db | |
| parent | 62657ed1fb9af7fd45bdfb767c942559ecf868e0 (diff) | |
| parent | 94141edc5b381e294777378aa1500810794a69b9 (diff) | |
| download | oslo-db-78d12d76969730d25f81b069b1b40730b91bd62f.tar.gz | |
Merge "Remove the sql_max_pool_size option."9.0.0
Diffstat (limited to 'oslo_db')
| -rw-r--r-- | oslo_db/options.py | 4 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_options.py | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/oslo_db/options.py b/oslo_db/options.py index ef13146..b20d0b7 100644 --- a/oslo_db/options.py +++ b/oslo_db/options.py @@ -69,10 +69,6 @@ database_opts = [ 'the 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. Setting a value of 0 indicates no limit.'), cfg.IntOpt('max_retries', diff --git a/oslo_db/tests/sqlalchemy/test_options.py b/oslo_db/tests/sqlalchemy/test_options.py index 4984254..b962182 100644 --- a/oslo_db/tests/sqlalchemy/test_options.py +++ b/oslo_db/tests/sqlalchemy/test_options.py @@ -30,7 +30,6 @@ class DbApiOptionsTestCase(test_utils.BaseTestCase): def test_deprecated_session_parameters(self): path = self.create_tempfiles([["tmp", b"""[DEFAULT] sql_connection=x://y.z -sql_max_pool_size=20 sql_max_retries=30 sql_retry_interval=40 sql_max_overflow=50 @@ -39,7 +38,6 @@ sql_connection_trace=True """]])[0] self.conf(['--config-file', path]) 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(40, self.conf.database.retry_interval) self.assertEqual(50, self.conf.database.max_overflow) @@ -71,7 +69,6 @@ pool_timeout=7 path = self.create_tempfiles([['tmp', b'[DATABASE]\n' b'sql_connection=fake_connection\n' b'sql_idle_timeout=100\n' - b'sql_max_pool_size=199\n' b'sql_max_retries=22\n' b'reconnect_interval=17\n' b'sqlalchemy_max_overflow=101\n' @@ -81,7 +78,6 @@ pool_timeout=7 self.assertEqual('fake_connection', self.conf.database.connection) self.assertEqual(100, self.conf.database.connection_recycle_time) 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(17, self.conf.database.retry_interval) self.assertEqual(101, self.conf.database.max_overflow) |