openstack
/
nova
Code Issues Proposed changes

Merge "Avoid unnecessary joins in delete_resource_provider"

This commit is contained in:
Zuul 2019-06-21 08:32:41 +00:00 committed by Gerrit Code Review
parent 1e63e24e01 8921a470ee
commit 1ca69e839f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2171,8 +2171,12 @@ class SchedulerReportClient(object):
# Delete any allocations for this resource provider.
# Since allocations are by consumer, we get the consumers on this
# host, which are its instances.
instances = objects.InstanceList.get_by_host_and_node(context,
host, nodename)
# TODO(mriedem): Optimize this up by adding an
# InstanceList.get_uuids_by_host_and_node method.
# Pass expected_attrs=[] to avoid joining on extra columns we
# don't use.
instances = objects.InstanceList.get_by_host_and_node(
context, host, nodename, expected_attrs=[])
for instance in instances:
self.delete_allocation_for_instance(context, instance.uuid)
try:

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

@ -3202,6 +3202,8 @@ class TestAllocations(SchedulerReportClientTestCase):
resp_mock = mock.Mock(status_code=204)
mock_delete.return_value = resp_mock
self.client.delete_resource_provider(self.context, cn, cascade=True)
mock_by_host.assert_called_once_with(
self.context, cn.host, cn.hypervisor_hostname, expected_attrs=[])
self.assertEqual(2, mock_del_alloc.call_count)
exp_url = "/resource_providers/%s" % uuids.cn
mock_delete.assert_called_once_with(