x/vmware-nsx
Code Issues Proposed changes

Merge "Remove SELECT FOR UPDATE use in delete_firewall"

Browse Source
This commit is contained in:
Jenkins 2014-09-06 15:24:19 +00:00 committed by Gerrit Code Review
commit a29482c059
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/db/firewall/firewall_db.py
View File

@ -270,12 +270,11 @@ class Firewall_db_mixin(firewall.FirewallPluginBase, base_db.CommonDbMixin):
def delete_firewall(self, context, id): def delete_firewall(self, context, id):
LOG.debug(_("delete_firewall() called")) LOG.debug(_("delete_firewall() called"))
with context.session.begin(subtransactions=True): with context.session.begin(subtransactions=True):
fw_query = context.session.query(
Firewall).with_lockmode('update')
firewall_db = fw_query.filter_by(id=id).one()
# Note: Plugin should ensure that it's okay to delete if the # Note: Plugin should ensure that it's okay to delete if the
# firewall is active # firewall is active
context.session.delete(firewall_db) count = context.session.query(Firewall).filter_by(id=id).delete()
if not count:
raise firewall.FirewallNotFound(firewall_id=id)
def get_firewall(self, context, id, fields=None): def get_firewall(self, context, id, fields=None):
LOG.debug(_("get_firewall() called")) LOG.debug(_("get_firewall() called"))