openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "Ensure DB pooling code works with newer eventlet versions" into milestone-proposed

This commit is contained in:
Jenkins 2013-03-26 01:34:53 +00:00 committed by Gerrit Code Review
parent c705fe21f1 428290399a
commit fa5863fef9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
quantum/db/api.py
View File

@ -137,8 +137,16 @@ def configure_db():
'max_size': cfg.CONF.DATABASE.sql_max_pool_size,
'max_idle': cfg.CONF.DATABASE.sql_idle_timeout
}
creator = db_pool.ConnectionPool(MySQLdb, **pool_args)
engine_args['creator'] = creator.create
pool = db_pool.ConnectionPool(MySQLdb, **pool_args)
def creator():
conn = pool.create()
# NOTE(belliott) eventlet >= 0.10 returns a tuple
if isinstance(conn, tuple):
_1, _2, conn = conn
return conn
engine_args['creator'] = creator
if (MySQLdb is None and cfg.CONF.DATABASE.sql_dbpool_enable):
LOG.warn(_("Eventlet connection pooling will not work without "
"python-mysqldb!"))