openstack
/
nova
Code Issues Proposed changes

Merge "Cleanup the caches when deleting a resource provider" into stable/ocata

This commit is contained in:
Zuul 2018-09-28 20:46:23 +00:00 committed by Gerrit Code Review
parent 4246d5779e ed36e85f6f
commit ab1182c8aa
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/scheduler/client/report.py
View File

@ -776,6 +776,9 @@ class SchedulerReportClient(object):
resp = self.delete(url)
if resp:
LOG.info(_LI("Deleted resource provider %s"), rp_uuid)
# clean the caches
self._resource_providers.pop(rp_uuid, None)
self._provider_aggregate_map.pop(rp_uuid, None)
else:
# Check for 404 since we don't need to log a warning if we tried to
# delete something which doesn"t actually exist.

4
nova/tests/unit/scheduler/client/test_report.py
View File

@ -1327,6 +1327,7 @@ class TestAllocations(SchedulerReportClientTestCase):
@mock.patch("nova.objects.InstanceList.get_by_host_and_node")
def test_delete_resource_provider_cascade(self, mock_by_host,
mock_del_alloc, mock_delete):
self.client._resource_providers[uuids.cn] = mock.Mock()
cn = objects.ComputeNode(uuid=uuids.cn, host="fake_host",
hypervisor_hostname="fake_hostname", )
inst1 = objects.Instance(uuid=uuids.inst1)
@ -1339,6 +1340,7 @@ class TestAllocations(SchedulerReportClientTestCase):
self.assertEqual(2, mock_del_alloc.call_count)
exp_url = "/resource_providers/%s" % uuids.cn
mock_delete.assert_called_once_with(exp_url)
self.assertNotIn(uuids.cn, self.client._resource_providers)
@mock.patch("nova.scheduler.client.report.SchedulerReportClient."
"delete")
@ -1347,6 +1349,7 @@ class TestAllocations(SchedulerReportClientTestCase):
@mock.patch("nova.objects.InstanceList.get_by_host_and_node")
def test_delete_resource_provider_no_cascade(self, mock_by_host,
mock_del_alloc, mock_delete):
self.client._provider_aggregate_map[uuids.cn] = mock.Mock()
cn = objects.ComputeNode(uuid=uuids.cn, host="fake_host",
hypervisor_hostname="fake_hostname", )
inst1 = objects.Instance(uuid=uuids.inst1)
@ -1359,6 +1362,7 @@ class TestAllocations(SchedulerReportClientTestCase):
mock_del_alloc.assert_not_called()
exp_url = "/resource_providers/%s" % uuids.cn
mock_delete.assert_called_once_with(exp_url)
self.assertNotIn(uuids.cn, self.client._provider_aggregate_map)
@mock.patch("nova.scheduler.client.report.SchedulerReportClient."
"delete")