x/vmware-nsx
Code Issues Proposed changes

Merge "ML2: move L3 cleanup out of network transaction"

Browse Source
This commit is contained in:
Jenkins 2014-10-01 09:08:12 +00:00 committed by Gerrit Code Review
commit 9bdc634bb5
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -580,9 +580,15 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
# to prevent deadlock waiting to acquire a DB lock # to prevent deadlock waiting to acquire a DB lock
# held by another thread in the same process, leading # held by another thread in the same process, leading
# to 'lock wait timeout' errors. # to 'lock wait timeout' errors.
#
# Process L3 first, since, depending on the L3 plugin, it may
# involve locking the db-access semaphore, sending RPC
# notifications, and/or calling delete_port on this plugin.
# Additionally, a rollback may not be enough to undo the
# deletion of a floating IP with certain L3 backends.
self._process_l3_delete(context, id)
with contextlib.nested(lockutils.lock('db-access'), with contextlib.nested(lockutils.lock('db-access'),
session.begin(subtransactions=True)): session.begin(subtransactions=True)):
self._process_l3_delete(context, id)
# Get ports to auto-delete. # Get ports to auto-delete.
ports = (session.query(models_v2.Port). ports = (session.query(models_v2.Port).
enable_eagerloads(False). enable_eagerloads(False).

17
neutron/tests/unit/ml2/test_ml2_plugin.py
View File

@ -24,6 +24,7 @@ from neutron.common import exceptions as exc
from neutron.common import utils from neutron.common import utils
from neutron import context from neutron import context
from neutron.db import db_base_plugin_v2 as base_plugin from neutron.db import db_base_plugin_v2 as base_plugin
from neutron.extensions import external_net as external_net
from neutron.extensions import multiprovidernet as mpnet from neutron.extensions import multiprovidernet as mpnet
from neutron.extensions import portbindings from neutron.extensions import portbindings
from neutron.extensions import providernet as pnet from neutron.extensions import providernet as pnet
@ -147,6 +148,22 @@ class TestMl2PortsV2(test_plugin.TestPortsV2, Ml2PluginV2TestCase):
mock.call(_("The port '%s' was deleted"), 'invalid-uuid') mock.call(_("The port '%s' was deleted"), 'invalid-uuid')
]) ])
def test_l3_cleanup_on_net_delete(self):
l3plugin = manager.NeutronManager.get_service_plugins().get(
service_constants.L3_ROUTER_NAT)
kwargs = {'arg_list': (external_net.EXTERNAL,),
external_net.EXTERNAL: True}
with self.network(**kwargs) as n:
with self.subnet(network=n, cidr='200.0.0.0/22'):
l3plugin.create_floatingip(
context.get_admin_context(),
{'floatingip': {'floating_network_id': n['network']['id'],
'tenant_id': n['network']['tenant_id']}}
)
self._delete('networks', n['network']['id'])
flips = l3plugin.get_floatingips(context.get_admin_context())
self.assertFalse(flips)
def test_delete_port_no_notify_in_disassociate_floatingips(self): def test_delete_port_no_notify_in_disassociate_floatingips(self):
ctx = context.get_admin_context() ctx = context.get_admin_context()
plugin = manager.NeutronManager.get_plugin() plugin = manager.NeutronManager.get_plugin()