openstack
/
oslo-incubator
Code Issues Proposed changes

db.sqlalchemy.session add [sql].idle_timeout 

Keystone is using idle_timeout in the [sql] section for the
idle timeout. Before Keystone can use oslo-incubator's
db.sqlalchemy.session we'll need to be able to have the old
option still be usable but deprecated.

bp use-common-oslo-db-code

Change-Id: Ic3dd4ec7f678f9564597830f9e4764d979a5d18a
This commit is contained in:
Brant Knudson 2013-12-04 16:05:20 -06:00
parent d2b62b4000
commit 915f8ab597
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack/common/db/sqlalchemy/session.py
View File

@ -289,7 +289,9 @@ database_opts = [
deprecated_opts=[cfg.DeprecatedOpt('sql_idle_timeout',
group='DEFAULT'),
cfg.DeprecatedOpt('sql_idle_timeout',
group='DATABASE')],
group='DATABASE'),
cfg.DeprecatedOpt('idle_timeout',
group='sql')],
help='timeout before idle sql connections are reaped'),
cfg.IntOpt('min_pool_size',
default=1,

4
tests/unit/db/sqlalchemy/test_sqlalchemy.py
View File

@ -111,12 +111,14 @@ pool_timeout=7
self.assertEqual(self.conf.database.max_overflow, 101)
self.assertEqual(self.conf.database.pool_timeout, 5)
def test_dbapi_database_deprecated_parameters_sql_connection(self):
def test_dbapi_database_deprecated_parameters_sql(self):
path = self.create_tempfiles([['tmp', '[sql]\n'
'connection=test_sql_connection\n'
'idle_timeout=99\n'
]])[0]
self.conf(['--config-file', path])
self.assertEqual(self.conf.database.connection, 'test_sql_connection')
self.assertEqual(self.conf.database.idle_timeout, 99)
class SessionErrorWrapperTestCase(test_base.DbTestCase):