openstack
/
neutron
Code Issues Proposed changes

Merge "Stop using nested transactions in OVO get/delete"

This commit is contained in:
Jenkins 2017-06-14 08:40:38 +00:00 committed by Gerrit Code Review
parent 18cffe63ae 72ac25c929
commit 044a06383b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/objects/base.py
View File

@ -432,7 +432,7 @@ class NeutronDbObject(NeutronObject):
raise o_exc.NeutronPrimaryKeyMissing(object_class=cls.__name__,
missing_keys=missing_keys)
with db_api.autonested_transaction(context.session):
with context.session.begin(subtransactions=True):
db_obj = obj_db_api.get_object(
context, cls.db_model,
**cls.modify_fields_to_db(kwargs)
@ -456,7 +456,7 @@ class NeutronDbObject(NeutronObject):
"""
if validate_filters:
cls.validate_filters(**kwargs)
with db_api.autonested_transaction(context.session):
with context.session.begin(subtransactions=True):
db_objs = obj_db_api.get_objects(
context, cls.db_model, _pager=_pager,
**cls.modify_fields_to_db(kwargs)
@ -503,7 +503,7 @@ class NeutronDbObject(NeutronObject):
"""
if validate_filters:
cls.validate_filters(**kwargs)
with db_api.autonested_transaction(context.session):
with context.session.begin(subtransactions=True):
return obj_db_api.delete_objects(
context, cls.db_model, **cls.modify_fields_to_db(kwargs))