x/vmware-nsx
Code Issues Proposed changes

Query for port before calling l3plugin.disassociate_floatingips()

Browse Source 
The call to l3plugin.disassociate_floatingips() trigggers several events
that could cause a timeout to occur trying to query the db for the port
therefore this patch changes the code to query first for the port.

Closes-bug: #1290478

Change-Id: I69fe9cff4b550240215329e1082a63cd11617faa
This commit is contained in:
Aaron Rosen 2014-03-05 11:32:39 -08:00
parent d057b03391
commit 4fc4191007
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,8 +701,6 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
session = context.session
with session.begin(subtransactions=True):
if l3plugin:
l3plugin.disassociate_floatingips(context, id)
try:
port_db = (session.query(models_v2.Port).
enable_eagerloads(False).
@ -721,6 +719,9 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
self._delete_port_binding(mech_context)
self._delete_port_security_group_bindings(context, id)
LOG.debug(_("Calling base delete_port"))
if l3plugin:
l3plugin.disassociate_floatingips(context, id)
super(Ml2Plugin, self).delete_port(context, id)
try: