openstack/aodh
Code Issues Proposed changes

Handle engine creation inside of Connection object

Browse Source 
We now store sqlalchemy engine object inside of our Connection object.
This allows us to open multiple concurrent connections.

Change-Id: I57b6d89f30c065643dbfab958e032f2adac59cd6
This commit is contained in:
Alexei Kornienko
2014-01-20 11:31:42 +02:00
committed by Gerrit Code Review
parent 693204a37e
commit f178612bef
5 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ceilometer/storage/impl_sqlalchemy.py
View File

@@ -176,17 +176,26 @@ class Connection(base.Connection):
conf.database.connection = \
os.environ.get('CEILOMETER_TEST_SQL_URL', url)
@staticmethod
def _get_db_session():
return sqlalchemy_session.get_session()
# NOTE(Alexei_987) Related to bug #1271103
# we steal objects from sqlalchemy_session
# to manage their lifetime on our own.
# This is needed to open several db connections
self._engine = sqlalchemy_session.get_engine()
self._maker = sqlalchemy_session.get_maker(self._engine)
sqlalchemy_session._ENGINE = None
sqlalchemy_session._MAKER = None
def _get_db_session(self):
return self._maker()
def upgrade(self):
migration.db_sync(self._get_db_session().get_bind())
migration.db_sync(self._engine)
def clear(self):
engine = self._get_db_session().get_bind()
for table in reversed(models.Base.metadata.sorted_tables):
engine.execute(table.delete())
self._engine.execute(table.delete())
self._maker.close_all()
self._engine.dispose()
@staticmethod
def _create_or_update(session, model_class, _id, source=None, **kwargs):