From 08ed859ce2c2388e903fb42f7efad9f9b265b7c9 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 21 Feb 2018 17:21:59 +0000 Subject: [PATCH] Revert "Don't try to lock for vif detach" This is causing more serious issues, as there is a race between tenant VIF removal and cleaning VIF adding. This reverts commit 4f79cb3932f2518ab3f06b86ceea065cbb399e8c. The release note is not deleted from it, because the change has already been released. A new one is added instead. Change-Id: I922f24293645ff6bb79ad753f49dc9548b9f2485 Closes-Bug: #1750785 --- ironic/conductor/manager.py | 5 ----- ironic/drivers/base.py | 4 ---- ironic/drivers/modules/network/common.py | 4 ++-- ironic/tests/unit/conductor/test_manager.py | 17 ++++++++--------- .../drivers/modules/network/test_common.py | 18 +----------------- ...ch-locking-fix-revert-3961d47fe419460a.yaml | 6 ++++++ 6 files changed, 17 insertions(+), 37 deletions(-) create mode 100644 releasenotes/notes/vif-detach-locking-fix-revert-3961d47fe419460a.yaml diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index 6565513f7e..e791601623 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -2951,12 +2951,7 @@ class ConductorManager(base_manager.BaseConductorManager): """ LOG.debug("RPC vif_detach called for the node %(node_id)s with " "vif_id %(vif_id)s", {'node_id': node_id, 'vif_id': vif_id}) - # NOTE(TheJulia): This task is explicitly called without a lock as - # long lived locks occur during node tear-down as a node goes into - # cleaning. The lack of a lock allows nova to remove the VIF record. - # See: https://bugs.launchpad.net/ironic/+bug/1743652 with task_manager.acquire(context, node_id, - shared=True, purpose='detach vif') as task: task.driver.network.validate(task) task.driver.network.vif_detach(task, vif_id) diff --git a/ironic/drivers/base.py b/ironic/drivers/base.py index 44c5444041..d1c4b9bde7 100644 --- a/ironic/drivers/base.py +++ b/ironic/drivers/base.py @@ -1042,10 +1042,6 @@ class NetworkInterface(BaseInterface): def vif_detach(self, task, vif_id): """Detach a virtual network interface from a node - Warning: This method is called by the conductor as a shared - task, to ensure that a vif can be detached during a long-lived lock. - Such as those that occur when a node is being unprovisioned. - :param task: A TaskManager instance. :param vif_id: A VIF ID to detach :raises: NetworkError, VifNotAttached diff --git a/ironic/drivers/modules/network/common.py b/ironic/drivers/modules/network/common.py index 5236f45cd8..dd99da1411 100644 --- a/ironic/drivers/modules/network/common.py +++ b/ironic/drivers/modules/network/common.py @@ -581,8 +581,8 @@ class NeutronVIFPortIDMixin(VIFPortIDMixin): # attached, and fail if not. port_like_obj = self._get_port_like_obj_by_vif_id(task, vif_id) + self._clear_vif_from_port_like_obj(port_like_obj) + # NOTE(vsaienko) allow to unplug VIFs from ACTIVE instance. if task.node.provision_state == states.ACTIVE: neutron.unbind_neutron_port(vif_id, context=task.context) - - self._clear_vif_from_port_like_obj(port_like_obj) diff --git a/ironic/tests/unit/conductor/test_manager.py b/ironic/tests/unit/conductor/test_manager.py index bfb0ba84c4..c2ab997d4e 100644 --- a/ironic/tests/unit/conductor/test_manager.py +++ b/ironic/tests/unit/conductor/test_manager.py @@ -36,7 +36,6 @@ from ironic.common import boot_devices from ironic.common import driver_factory from ironic.common import exception from ironic.common import images -from ironic.common import neutron from ironic.common import states from ironic.common import swift from ironic.conductor import manager @@ -4481,17 +4480,17 @@ class VifTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase): mock_detach.assert_called_once_with(mock.ANY, "interface") mock_valid.assert_called_once_with(mock.ANY, mock.ANY) - @mock.patch.object(neutron, 'unbind_neutron_port', autpspec=True) - def test_vif_detach_node_is_locked(self, mock_detach, mock_valid): + @mock.patch.object(n_flat.FlatNetwork, 'vif_detach', autpspec=True) + def test_vif_detach_node_locked(self, mock_detach, mock_valid): node = obj_utils.create_test_node(self.context, driver='fake', reservation='fake-reserv') - obj_utils.create_test_port(self.context, - node_id=node.id, - internal_info={ - 'tenant_vif_port_id': 'fake-id'}) - self.service.vif_detach(self.context, node.uuid, 'fake-id') + exc = self.assertRaises(messaging.rpc.ExpectedException, + self.service.vif_detach, + self.context, node.uuid, "interface") + # Compare true exception hidden by @messaging.expected_exceptions + self.assertEqual(exception.NodeLocked, exc.exc_info[0]) self.assertFalse(mock_detach.called) - self.assertTrue(mock_valid.called) + self.assertFalse(mock_valid.called) @mock.patch.object(n_flat.FlatNetwork, 'vif_detach', autpspec=True) def test_vif_detach_raises_network_error(self, mock_detach, diff --git a/ironic/tests/unit/drivers/modules/network/test_common.py b/ironic/tests/unit/drivers/modules/network/test_common.py index cccb2c0166..a64fc348fe 100644 --- a/ironic/tests/unit/drivers/modules/network/test_common.py +++ b/ironic/tests/unit/drivers/modules/network/test_common.py @@ -941,28 +941,12 @@ class TestNeutronVifPortIDMixin(db_base.DbTestCase): self.node.save() mock_get.return_value = self.port mock_unp.side_effect = exception.NetworkError - with task_manager.acquire(self.context, self.node.id, - shared=True) as task: + with task_manager.acquire(self.context, self.node.id) as task: self.assertRaises(exception.NetworkError, self.interface.vif_detach, task, 'fake_vif_id') mock_unp.assert_called_once_with('fake_vif_id', context=task.context) mock_get.assert_called_once_with(task, 'fake_vif_id') - mock_clear.assert_not_called() - - @mock.patch.object(common.VIFPortIDMixin, '_clear_vif_from_port_like_obj') - @mock.patch.object(neutron_common, 'unbind_neutron_port', autospec=True) - @mock.patch.object(common.VIFPortIDMixin, '_get_port_like_obj_by_vif_id') - def test_vif_detach_deleting_node_success(self, mock_get, mock_unp, - mock_clear): - self.node.provision_state = states.DELETING - self.node.save() - mock_get.return_value = self.port - with task_manager.acquire(self.context, self.node.id, - shared=True) as task: - self.interface.vif_detach(task, 'fake_vif_id') - self.assertFalse(mock_unp.called) - mock_get.assert_called_once_with(task, 'fake_vif_id') mock_clear.assert_called_once_with(self.port) @mock.patch.object(common_utils, 'warn_about_deprecated_extra_vif_port_id', diff --git a/releasenotes/notes/vif-detach-locking-fix-revert-3961d47fe419460a.yaml b/releasenotes/notes/vif-detach-locking-fix-revert-3961d47fe419460a.yaml new file mode 100644 index 0000000000..9d7f85d0f6 --- /dev/null +++ b/releasenotes/notes/vif-detach-locking-fix-revert-3961d47fe419460a.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Reverts the fix for orphaned VIF records from the previous release, as + it causes a regression. See `bug 1750785 + `_ for details.