openstack
/
oslo.db
Code Issues Proposed changes

Merge "Remove use of Session.begin.subtransactions flag"

This commit is contained in:
Zuul 2022-02-02 21:02:51 +00:00 committed by Gerrit Code Review
parent eec481d7e6 cd5f697a17
commit f756a19567
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oslo_db/sqlalchemy/models.py
View File

@ -34,18 +34,8 @@ class ModelBase(object):
def save(self, session):
"""Save this object."""
# NOTE(boris-42): This part of code should be look like:
# session.add(self)
# session.flush()
# But there is a bug in sqlalchemy and eventlet that
# raises NoneType exception if there is no running
# transaction and rollback is called. As long as
# sqlalchemy has this bug we have to create transaction
# explicitly.
with session.begin(subtransactions=True):
session.add(self)
session.flush()
session.add(self)
session.flush()
def __setitem__(self, key, value):
setattr(self, key, value)

5
oslo_db/tests/fixtures.py
View File

@ -45,11 +45,6 @@ class WarningsFixture(fixtures.Fixture):
message=r'The Session.autocommit parameter is deprecated .*',
category=sqla_exc.SADeprecationWarning)
warnings.filterwarnings(
'once',
message=r'The Session.begin.subtransactions flag is deprecated .*',
category=sqla_exc.SADeprecationWarning)
warnings.filterwarnings(
'once',
message=r'Calling \.begin\(\) when a transaction is already .*',