openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Retry namespace deletion to mitigate cascading race"

This commit is contained in:
Zuul 2018-06-11 10:41:41 +00:00 committed by Gerrit Code Review
parent 599a59dfa6 8f23a40d7a
commit b97051af2d
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kuryr_kubernetes/controller/drivers/namespace_subnet.py
View File

@ -90,11 +90,25 @@ class NamespacePodSubnetDriver(default_subnet.DefaultPodSubnetDriver):
try:
neutron.remove_interface_router(router_id,
{"subnet_id": subnet_id})
neutron.delete_network(net_id)
except n_exc.NotFound as ex:
LOG.debug("Neutron resource not found: %s", ex)
except n_exc.NotFound:
LOG.debug("Subnet %(subnet)s not attached to router %(router)s",
{'subnet': subnet_id, 'router': router_id})
except n_exc.NeutronClientException:
LOG.exception("Error deleting neutron resources.")
LOG.exception("Error deleting subnet %(subnet)s from router "
"%(router)s.", {'subnet': subnet_id, 'router':
router_id})
raise
try:
neutron.delete_network(net_id)
except n_exc.NotFound:
LOG.debug("Neutron Network not found: %s", net_id)
except n_exc.NetworkInUseClient:
LOG.exception("One or more ports in use on the network %s.",
net_id)
raise exceptions.ResourceNotReady(net_id)
except n_exc.NeutronClientException:
LOG.exception("Error deleting network %s.", net_id)
raise
self._del_kuryrnet_crd(net_crd_name)

4
kuryr_kubernetes/tests/unit/controller/drivers/test_namespace_subnet.py
View File

@ -259,9 +259,9 @@ class TestNamespacePodSubnetDriver(test_base.TestCase):
kubernetes = self.useFixture(k_fix.MockK8sClient()).client
kubernetes.get.return_value = crd
neutron.delete_network.side_effect = n_exc.NeutronClientException
neutron.delete_network.side_effect = n_exc.NetworkInUseClient
self.assertRaises(n_exc.NeutronClientException,
self.assertRaises(k_exc.ResourceNotReady,
cls.delete_namespace_subnet, m_driver, net_crd_name)
kubernetes.get.assert_called_once()