x/vmware-nsx
Code Issues Proposed changes

Merge "Fix race condition in delete_port method. Fix update_port method"

Browse Source
This commit is contained in:
Jenkins 2014-02-05 11:47:54 +00:00 committed by Gerrit Code Review
commit 91d49e7893
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
neutron/plugins/ml2/plugin.py
View File

@ -589,9 +589,12 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
session = context.session session = context.session
changed_fixed_ips = 'fixed_ips' in port['port'] changed_fixed_ips = 'fixed_ips' in port['port']
with session.begin(subtransactions=True): with session.begin(subtransactions=True):
port_db = (session.query(models_v2.Port). try:
enable_eagerloads(False). port_db = (session.query(models_v2.Port).
filter_by(id=id).with_lockmode('update').one()) enable_eagerloads(False).
filter_by(id=id).with_lockmode('update').one())
except sql_exc.NoResultFound:
raise exc.PortNotFound(port_id=id)
original_port = self._make_port_dict(port_db) original_port = self._make_port_dict(port_db)
updated_port = super(Ml2Plugin, self).update_port(context, id, updated_port = super(Ml2Plugin, self).update_port(context, id,
port) port)
@ -644,9 +647,15 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
with session.begin(subtransactions=True): with session.begin(subtransactions=True):
if l3plugin: if l3plugin:
l3plugin.disassociate_floatingips(context, id) l3plugin.disassociate_floatingips(context, id)
port_db = (session.query(models_v2.Port). try:
enable_eagerloads(False). port_db = (session.query(models_v2.Port).
filter_by(id=id).with_lockmode('update').one()) enable_eagerloads(False).
filter_by(id=id).with_lockmode('update').one())
except sql_exc.NoResultFound:
# the port existed when l3plugin.prevent_l3_port_deletion
# was called but now is already gone
LOG.debug(_("The port '%s' was deleted"), id)
return
port = self._make_port_dict(port_db) port = self._make_port_dict(port_db)
network = self.get_network(context, port['network_id']) network = self.get_network(context, port['network_id'])