openstack
/
nova
Code Issues Proposed changes

Merge "Pull up compute node queries to init_host"

This commit is contained in:
Zuul 2019-10-10 00:53:01 +00:00 committed by Gerrit Code Review
parent 08273d2a9f afe267590f
commit 27818dd607
3 changed files with 217 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
nova/compute/manager.py
View File

@ -653,7 +653,7 @@ class ComputeManager(manager.Manager):
local_instances.append(instance)
return local_instances
def _destroy_evacuated_instances(self, context):
def _destroy_evacuated_instances(self, context, node_cache):
"""Destroys evacuated instances.
While nova-compute was down, the instances running on it could be
@ -669,6 +669,8 @@ class ComputeManager(manager.Manager):
hypervisor or not.
:param context: The request context
:param node_cache: A dict of ComputeNode objects keyed by the UUID of
the compute node
:return: A dict keyed by instance uuid mapped to Migration objects
for instances that were migrated away from this host
"""
@ -724,10 +726,9 @@ class ComputeManager(manager.Manager):
network_info,
bdi, destroy_disks)
# NOTE(gibi): We are called from init_host and at this point the
# compute_nodes of the resource tracker has not been populated yet so
# we cannot rely on the resource tracker here.
compute_nodes = {}
hostname_to_cn_uuid = {
cn.hypervisor_hostname: cn.uuid
for cn in node_cache.values()}
for instance_uuid, migration in evacuations.items():
try:
@ -746,17 +747,12 @@ class ComputeManager(manager.Manager):
LOG.info('Cleaning up allocations of the instance as it has been '
'evacuated from this host',
instance=instance)
if migration.source_node not in compute_nodes:
try:
cn_uuid = objects.ComputeNode.get_by_host_and_nodename(
context, self.host, migration.source_node).uuid
compute_nodes[migration.source_node] = cn_uuid
except exception.ComputeHostNotFound:
if migration.source_node not in hostname_to_cn_uuid:
LOG.error("Failed to clean allocation of evacuated "
"instance as the source node %s is not found",
migration.source_node, instance=instance)
continue
cn_uuid = compute_nodes[migration.source_node]
cn_uuid = hostname_to_cn_uuid[migration.source_node]
# If the instance was deleted in the interim, assume its
# allocations were properly cleaned up (either by its hosting
@ -1290,6 +1286,36 @@ class ComputeManager(manager.Manager):
'service will only be synchronized by the '
'_sync_power_states periodic task.')
def _get_nodes(self, context):
"""Queried the ComputeNode objects from the DB that are reported by the
hypervisor.
:param context: the request context
:return: a dict of ComputeNode objects keyed by the UUID of the given
node.
"""
nodes_by_uuid = {}
try:
node_names = self.driver.get_available_nodes()
except exception.VirtDriverNotReady:
LOG.warning(
"Virt driver is not ready. If this is the first time this "
"service is starting on this host, then you can ignore this "
"warning.")
return {}
for node_name in node_names:
try:
node = objects.ComputeNode.get_by_host_and_nodename(
context, self.host, node_name)
nodes_by_uuid[node.uuid] = node
except exception.ComputeHostNotFound:
LOG.warning(
"Compute node %s not found in the database. If this is "
"the first time this service is starting on this host, "
"then you can ignore this warning.", node_name)
return nodes_by_uuid
def init_host(self):
"""Initialization for a standalone compute service."""
@ -1325,9 +1351,21 @@ class ComputeManager(manager.Manager):
self._validate_pinning_configuration(instances)
# NOTE(gibi): At this point the compute_nodes of the resource tracker
# has not been populated yet so we cannot rely on the resource tracker
# here.
# NOTE(gibi): If ironic and vcenter virt driver slow start time
# becomes problematic here then we should consider adding a config
# option or a driver flag to tell us if we should thread
# _destroy_evacuated_instances and
# _error_out_instances_whose_build_was_interrupted out in the
# background on startup
nodes_by_uuid = self._get_nodes(context)
try:
# checking that instance was not already evacuated to other host
evacuated_instances = self._destroy_evacuated_instances(context)
evacuated_instances = self._destroy_evacuated_instances(
context, nodes_by_uuid)
# Initialise instances on the host that are not evacuating
for instance in instances:
@ -1342,12 +1380,8 @@ class ComputeManager(manager.Manager):
# handled by the above calls.
already_handled = {instance.uuid for instance in instances}.union(
evacuated_instances)
# NOTE(gibi): If ironic and vcenter virt driver slow start time
# becomes problematic here then we should consider adding a config
# option or a driver flag to tell us if we should thread this out
# in the background on startup
self._error_out_instances_whose_build_was_interrupted(
context, already_handled)
context, already_handled, nodes_by_uuid.keys())
finally:
if CONF.defer_iptables_apply:
@ -1362,7 +1396,7 @@ class ComputeManager(manager.Manager):
self._update_scheduler_instance_info(context, instances)
def _error_out_instances_whose_build_was_interrupted(
self, context, already_handled_instances):
self, context, already_handled_instances, node_uuids):
"""If there are instances in BUILDING state that are not
assigned to this host but have allocations in placement towards
this compute that means the nova-compute service was
@ -1374,6 +1408,8 @@ class ComputeManager(manager.Manager):
:param context: The request context
:param already_handled_instances: The set of instance UUIDs that the
host initialization process already handled in some way.
:param node_uuids: The list of compute node uuids handled by this
service
"""
# Strategy:
@ -1386,30 +1422,7 @@ class ComputeManager(manager.Manager):
LOG.info(
"Looking for unclaimed instances stuck in BUILDING status for "
"nodes managed by this host")
try:
node_names = self.driver.get_available_nodes()
except exception.VirtDriverNotReady:
LOG.warning(
"Virt driver is not ready. Therefore unable to error out any "
"instances stuck in BUILDING state on this node. If this is "
"the first time this service is starting on this host, then "
"you can ignore this warning.")
return
for node_name in node_names:
try:
cn_uuid = objects.ComputeNode.get_by_host_and_nodename(
context, self.host, node_name).uuid
except exception.ComputeHostNotFound:
LOG.warning(
"Compute node %s not found in the database and therefore "
"unable to error out any instances stuck in BUILDING "
"state on this node. If this is the first time this "
"service is starting on this host, then you can ignore "
"this warning.", node_name)
continue
for cn_uuid in node_uuids:
try:
f = self.reportclient.get_allocations_for_resource_provider
allocations = f(context, cn_uuid).allocations

24
nova/tests/unit/compute/test_compute.py
View File

@ -7740,11 +7740,17 @@ class ComputeTestCase(BaseTestCase,
mock_get_inst.return_value = instances
mock_get_blk.return_value = 'fake_bdi'
mock_is_inst.return_value = True
node_cache = {
self.rt.compute_nodes[NODENAME].uuid:
objects.ComputeNode(
uuid=self.rt.compute_nodes[NODENAME].uuid,
hypervisor_hostname=NODENAME)
}
with mock.patch.object(
self.compute.network_api, 'get_instance_nw_info',
return_value='fake_network_info') as mock_get_nw:
self.compute._destroy_evacuated_instances(fake_context)
self.compute._destroy_evacuated_instances(fake_context, node_cache)
mock_get_filter.assert_called_once_with(fake_context,
{'source_compute': self.compute.host,
@ -7807,11 +7813,17 @@ class ComputeTestCase(BaseTestCase,
mock_get_blk.return_value = 'fake-bdi'
mock_check_local.return_value = {'filename': 'tmpfilename'}
mock_check.return_value = False
node_cache = {
self.rt.compute_nodes[NODENAME].uuid:
objects.ComputeNode(
uuid=self.rt.compute_nodes[NODENAME].uuid,
hypervisor_hostname=NODENAME)
}
with mock.patch.object(
self.compute.network_api, 'get_instance_nw_info',
return_value='fake_network_info') as mock_get_nw:
self.compute._destroy_evacuated_instances(fake_context)
self.compute._destroy_evacuated_instances(fake_context, node_cache)
mock_get_drv.assert_called_once_with(fake_context)
mock_get_nw.assert_called_once_with(fake_context, evacuated_instance)
@ -7871,11 +7883,17 @@ class ComputeTestCase(BaseTestCase,
mock_get_inst.return_value = instances
mock_get_blk.return_value = 'fake_bdi'
mock_check_local.side_effect = NotImplementedError
node_cache = {
self.rt.compute_nodes[NODENAME].uuid:
objects.ComputeNode(
uuid=self.rt.compute_nodes[NODENAME].uuid,
hypervisor_hostname=NODENAME)
}
with mock.patch.object(
self.compute.network_api, 'get_instance_nw_info',
return_value='fake_network_info') as mock_get_nw:
self.compute._destroy_evacuated_instances(fake_context)
self.compute._destroy_evacuated_instances(fake_context, node_cache)
mock_get_inst.assert_called_once_with(fake_context)
mock_get_nw.assert_called_once_with(fake_context, evacuated_instance)

253
nova/tests/unit/compute/test_compute_mgr.py
View File

@ -726,6 +726,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
return instance_obj._make_instance_list(
self.context, objects.InstanceList(), db_list, None)
@mock.patch.object(manager.ComputeManager, '_get_nodes')
@mock.patch.object(manager.ComputeManager,
'_error_out_instances_whose_build_was_interrupted')
@mock.patch.object(fake_driver.FakeDriver, 'init_host')
@ -743,10 +744,15 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
mock_validate_pinning,
mock_destroy, mock_admin_ctxt, mock_host_get,
mock_filter_off, mock_filter_on, mock_init_host,
mock_error_interrupted, defer_iptables_apply):
mock_error_interrupted, mock_get_nodes,
defer_iptables_apply):
mock_admin_ctxt.return_value = self.context
inst_list = _make_instance_list(startup_instances)
mock_host_get.return_value = inst_list
our_node = objects.ComputeNode(
host='fake-host', uuid=uuids.our_node_uuid,
hypervisor_hostname='fake-node')
mock_get_nodes.return_value = {uuids.our_node_uuid: our_node}
self.compute.init_host()
@ -754,7 +760,8 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
self.assertTrue(mock_filter_on.called)
mock_validate_pinning.assert_called_once_with(inst_list)
mock_destroy.assert_called_once_with(self.context)
mock_destroy.assert_called_once_with(
self.context, {uuids.our_node_uuid: our_node})
mock_inst_init.assert_has_calls(
[mock.call(self.context, inst_list[0]),
mock.call(self.context, inst_list[1]),
@ -770,7 +777,8 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
self.context, inst_list)
mock_error_interrupted.assert_called_once_with(
self.context, {inst.uuid for inst in inst_list})
self.context, {inst.uuid for inst in inst_list},
mock_get_nodes.return_value.keys())
# Test with defer_iptables_apply
self.flags(defer_iptables_apply=True)
@ -780,6 +788,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
self.flags(defer_iptables_apply=False)
_do_mock_calls(defer_iptables_apply=False)
@mock.patch('nova.compute.manager.ComputeManager._get_nodes')
@mock.patch('nova.compute.manager.ComputeManager.'
'_error_out_instances_whose_build_was_interrupted')
@mock.patch('nova.objects.InstanceList.get_by_host',
@ -790,15 +799,23 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
mock.NonCallableMock())
@mock.patch('nova.compute.manager.ComputeManager.'
'_update_scheduler_instance_info', mock.NonCallableMock())
def test_init_host_no_instances(self, mock_destroy_evac_instances,
mock_get_by_host, mock_error_interrupted):
def test_init_host_no_instances(
self, mock_destroy_evac_instances, mock_get_by_host,
mock_error_interrupted, mock_get_nodes):
"""Tests the case that init_host runs and there are no instances
on this host yet (it's brand new). Uses NonCallableMock for the
methods we assert should not be called.
"""
mock_get_nodes.return_value = {
uuids.cn_uuid1: objects.ComputeNode(
uuid=uuids.cn_uuid1, hypervisor_hostname='node1')}
self.compute.init_host()
mock_error_interrupted.assert_called_once_with(mock.ANY, set())
mock_error_interrupted.assert_called_once_with(
test.MatchType(nova.context.RequestContext), set(),
mock_get_nodes.return_value.keys())
mock_get_nodes.assert_called_once_with(
test.MatchType(nova.context.RequestContext))
@mock.patch('nova.objects.InstanceList')
@mock.patch('nova.objects.MigrationList.get_by_filters')
@ -855,9 +872,9 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
self.compute.init_virt_events()
self.assertFalse(mock_register.called)
@mock.patch('nova.compute.manager.ComputeManager._get_nodes')
@mock.patch.object(manager.ComputeManager,
'_error_out_instances_whose_build_was_interrupted')
@mock.patch('nova.objects.ComputeNode.get_by_host_and_nodename')
@mock.patch('nova.scheduler.utils.resources_from_flavor')
@mock.patch.object(manager.ComputeManager, '_get_instances_on_driver')
@mock.patch.object(manager.ComputeManager, 'init_virt_events')
@ -871,7 +888,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
def test_init_host_with_evacuated_instance(self, mock_save, mock_mig_get,
mock_temp_mut, mock_init_host, mock_destroy, mock_host_get,
mock_admin_ctxt, mock_init_virt, mock_get_inst, mock_resources,
mock_get_node, mock_error_interrupted):
mock_error_interrupted, mock_get_nodes):
our_host = self.compute.host
not_our_host = 'not-' + our_host
@ -882,8 +899,10 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
mock_mig_get.return_value = [migration]
mock_admin_ctxt.return_value = self.context
mock_host_get.return_value = objects.InstanceList()
our_node = objects.ComputeNode(host=our_host, uuid=uuids.our_node_uuid)
mock_get_node.return_value = our_node
our_node = objects.ComputeNode(
host=our_host, uuid=uuids.our_node_uuid,
hypervisor_hostname='fake-node')
mock_get_nodes.return_value = {uuids.our_node_uuid: our_node}
mock_resources.return_value = mock.sentinel.my_resources
# simulate failed instance
@ -918,8 +937,10 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
mock_save.assert_called_once_with()
mock_error_interrupted.assert_called_once_with(
self.context, {deleted_instance.uuid})
self.context, {deleted_instance.uuid},
mock_get_nodes.return_value.keys())
@mock.patch('nova.compute.manager.ComputeManager._get_nodes')
@mock.patch.object(manager.ComputeManager,
'_error_out_instances_whose_build_was_interrupted')
@mock.patch.object(context, 'get_admin_context')
@ -930,7 +951,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
'_destroy_evacuated_instances')
def test_init_host_with_in_progress_evacuations(self, mock_destroy_evac,
mock_init_instance, mock_init_host, mock_host_get,
mock_admin_ctxt, mock_error_interrupted):
mock_admin_ctxt, mock_error_interrupted, mock_get_nodes):
"""Assert that init_instance is not called for instances that are
evacuating from the host during init_host.
"""
@ -946,13 +967,80 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
mock_destroy_evac.return_value = {
uuids.evac_instance: evacuating_instance
}
our_node = objects.ComputeNode(
host='fake-host', uuid=uuids.our_node_uuid,
hypervisor_hostname='fake-node')
mock_get_nodes.return_value = {uuids.our_node_uuid: our_node}
self.compute.init_host()
mock_init_instance.assert_called_once_with(
self.context, active_instance)
mock_error_interrupted.assert_called_once_with(
self.context, {active_instance.uuid, evacuating_instance.uuid})
self.context, {active_instance.uuid, evacuating_instance.uuid},
mock_get_nodes.return_value.keys())
@mock.patch.object(objects.ComputeNode, 'get_by_host_and_nodename')
@mock.patch.object(fake_driver.FakeDriver, 'get_available_nodes')
def test_get_nodes(self, mock_driver_get_nodes, mock_get_by_host_and_node):
mock_driver_get_nodes.return_value = ['fake-node1', 'fake-node2']
cn1 = objects.ComputeNode(uuid=uuids.cn1)
cn2 = objects.ComputeNode(uuid=uuids.cn2)
mock_get_by_host_and_node.side_effect = [cn1, cn2]
nodes = self.compute._get_nodes(self.context)
self.assertEqual({uuids.cn1: cn1, uuids.cn2: cn2}, nodes)
mock_driver_get_nodes.assert_called_once_with()
mock_get_by_host_and_node.assert_has_calls([
mock.call(self.context, self.compute.host, 'fake-node1'),
mock.call(self.context, self.compute.host, 'fake-node2'),
])
@mock.patch.object(manager.LOG, 'warning')
@mock.patch.object(
objects.ComputeNode, 'get_by_host_and_nodename',
new_callable=mock.NonCallableMock)
@mock.patch.object(
fake_driver.FakeDriver, 'get_available_nodes',
side_effect=exception.VirtDriverNotReady)
def test_get_nodes_driver_not_ready(
self, mock_driver_get_nodes, mock_get_by_host_and_node,
mock_log_warning):
mock_driver_get_nodes.return_value = ['fake-node1', 'fake-node2']
nodes = self.compute._get_nodes(self.context)
self.assertEqual({}, nodes)
mock_log_warning.assert_called_once_with(
"Virt driver is not ready. If this is the first time this service "
"is starting on this host, then you can ignore this warning.")
@mock.patch.object(manager.LOG, 'warning')
@mock.patch.object(objects.ComputeNode, 'get_by_host_and_nodename')
@mock.patch.object(fake_driver.FakeDriver, 'get_available_nodes')
def test_get_nodes_node_not_found(
self, mock_driver_get_nodes, mock_get_by_host_and_node,
mock_log_warning):
mock_driver_get_nodes.return_value = ['fake-node1', 'fake-node2']
cn2 = objects.ComputeNode(uuid=uuids.cn2)
mock_get_by_host_and_node.side_effect = [
exception.ComputeHostNotFound(host='fake-node1'), cn2]
nodes = self.compute._get_nodes(self.context)
self.assertEqual({uuids.cn2: cn2}, nodes)
mock_driver_get_nodes.assert_called_once_with()
mock_get_by_host_and_node.assert_has_calls([
mock.call(self.context, self.compute.host, 'fake-node1'),
mock.call(self.context, self.compute.host, 'fake-node2'),
])
mock_log_warning.assert_called_once_with(
"Compute node %s not found in the database. If this is the first "
"time this service is starting on this host, then you can ignore "
"this warning.", 'fake-node1')
@mock.patch.object(objects.InstanceList, 'get_by_host',
new=mock.Mock())
@ -972,15 +1060,9 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
@mock.patch.object(objects.InstanceList, 'get_by_filters')
@mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
'get_allocations_for_resource_provider')
@mock.patch.object(objects.ComputeNode, 'get_by_host_and_nodename')
@mock.patch.object(fake_driver.FakeDriver, 'get_available_nodes')
def test_init_host_with_interrupted_instance_build(
self, mock_get_nodes, mock_get_by_host_and_node,
mock_get_allocations, mock_get_instances, mock_instance_save):
mock_get_nodes.return_value = ['fake-node']
mock_get_by_host_and_node.return_value = objects.ComputeNode(
host=self.compute.host, uuid=uuids.cn_uuid)
self, mock_get_allocations, mock_get_instances,
mock_instance_save):
active_instance = fake_instance.fake_instance_obj(
self.context, host=self.compute.host, uuid=uuids.active_instance)
@ -1013,12 +1095,8 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
# by init_host and init_instance
self.compute._error_out_instances_whose_build_was_interrupted(
self.context,
{inst.uuid for inst in [active_instance, evacuating_instance]})
mock_get_by_host_and_node.assert_called_once_with(
self.context, self.compute.host, 'fake-node')
mock_get_allocations.assert_called_once_with(
self.context, uuids.cn_uuid)
{inst.uuid for inst in [active_instance, evacuating_instance]},
[uuids.cn_uuid])
mock_get_instances.assert_called_once_with(
self.context,
@ -1031,63 +1109,10 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
mock_instance_save.assert_called_once_with()
self.assertEqual(vm_states.ERROR, interrupted_instance.vm_state)
@mock.patch.object(manager.LOG, 'warning')
@mock.patch.object(
fake_driver.FakeDriver, 'get_available_nodes',
side_effect=exception.VirtDriverNotReady)
def test_init_host_with_interrupted_instance_build_driver_not_ready(
self, mock_get_nodes, mock_log_warning):
self.compute._error_out_instances_whose_build_was_interrupted(
self.context, set())
mock_log_warning.assert_called_once_with(
"Virt driver is not ready. Therefore unable to error out any "
"instances stuck in BUILDING state on this node. If this is the "
"first time this service is starting on this host, then you can "
"ignore this warning.")
@mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
'get_allocations_for_resource_provider')
@mock.patch.object(objects.ComputeNode, 'get_by_host_and_nodename')
@mock.patch.object(fake_driver.FakeDriver, 'get_available_nodes')
def test_init_host_with_interrupted_instance_build_compute_node_not_found(
self, mock_get_nodes, mock_get_by_host_and_node,
mock_get_allocations):
mock_get_nodes.return_value = ['fake-node1', 'fake-node2']
mock_get_by_host_and_node.side_effect = [
exception.ComputeHostNotFound(host='fake-node1'),
objects.ComputeNode(host=self.compute.host, uuid=uuids.cn_uuid)]
self.compute._error_out_instances_whose_build_was_interrupted(
self.context, set())
# check that nova skip the node that is not found in the db and
# continue with the next
mock_get_by_host_and_node.assert_has_calls(
[
mock.call(self.context, self.compute.host, 'fake-node1'),
mock.call(self.context, self.compute.host, 'fake-node2'),
]
)
# placement only queried for the existing compute
mock_get_allocations.assert_called_once_with(
self.context, uuids.cn_uuid)
@mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
'get_allocations_for_resource_provider')
@mock.patch.object(objects.ComputeNode, 'get_by_host_and_nodename')
@mock.patch.object(fake_driver.FakeDriver, 'get_available_nodes')
def test_init_host_with_interrupted_instance_build_compute_rp_not_found(
self, mock_get_nodes, mock_get_by_host_and_node,
mock_get_allocations):
mock_get_nodes.return_value = ['fake-node1', 'fake-node2']
mock_get_by_host_and_node.side_effect = [
objects.ComputeNode(host=self.compute.host, uuid=uuids.cn1_uuid),
objects.ComputeNode(host=self.compute.host, uuid=uuids.cn2_uuid),
]
self, mock_get_allocations):
mock_get_allocations.side_effect = [
exception.ResourceProviderAllocationRetrievalFailed(
@ -1096,7 +1121,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
]
self.compute._error_out_instances_whose_build_was_interrupted(
self.context, set())
self.context, set(), [uuids.cn1_uuid, uuids.cn2_uuid])
# check that nova skip the node that is not found in placement and
# continue with the next
@ -4469,7 +4494,8 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
'nova.objects.MigrationList.get_by_filters') as migration_list:
migration_list.return_value = []
result = self.compute._destroy_evacuated_instances(self.context)
result = self.compute._destroy_evacuated_instances(
self.context, {})
self.assertEqual({}, result)
def test_destroy_evacuated_instances(self):
@ -4497,8 +4523,12 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
migration.status = 'done'
migration.source_node = 'fake-node'
our_node = objects.ComputeNode(
host=our_host, uuid=uuids.our_node_uuid)
node_cache = {
uuids.our_node_uuid:
objects.ComputeNode(
uuid=uuids.our_node_uuid,
hypervisor_hostname='fake-node')
}
with test.nested(
mock.patch.object(self.compute, '_get_instances_on_driver',
@ -4513,26 +4543,22 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
mock.patch.object(self.compute.driver, 'destroy'),
mock.patch('nova.objects.MigrationList.get_by_filters'),
mock.patch('nova.objects.Migration.save'),
mock.patch('nova.objects.ComputeNode.get_by_host_and_nodename'),
mock.patch('nova.scheduler.utils.resources_from_flavor'),
mock.patch.object(self.compute.reportclient,
'remove_provider_tree_from_instance_allocation')
) as (_get_instances_on_driver, get_instance_nw_info,
_get_instance_block_device_info, _is_instance_storage_shared,
destroy, migration_list, migration_save, get_node,
get_resources, remove_allocation):
destroy, migration_list, migration_save, get_resources,
remove_allocation):
migration_list.return_value = [migration]
get_node.return_value = our_node
get_resources.return_value = mock.sentinel.resources
self.compute._destroy_evacuated_instances(self.context)
self.compute._destroy_evacuated_instances(self.context, node_cache)
# Only instance 2 should be deleted. Instance 1 is still running
# here, but no migration from our host exists, so ignore it
destroy.assert_called_once_with(self.context, instance_2, None,
{}, True)
get_node.assert_called_once_with(
self.context, our_host, migration.source_node)
remove_allocation.assert_called_once_with(
self.context, instance_2.uuid, uuids.our_node_uuid)
@ -4567,8 +4593,12 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
migration_2.status = 'done'
migration_2.source_node = 'fake-node'
our_node = objects.ComputeNode(
host=our_host, uuid=uuids.our_node_uuid)
node_cache = {
uuids.our_node_uuid:
objects.ComputeNode(
uuid=uuids.our_node_uuid,
hypervisor_hostname='fake-node')
}
with test.nested(
mock.patch.object(self.compute, '_get_instances_on_driver',
@ -4583,26 +4613,18 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
mock.patch.object(self.compute.driver, 'destroy'),
mock.patch('nova.objects.MigrationList.get_by_filters'),
mock.patch('nova.objects.Migration.save'),
mock.patch('nova.objects.ComputeNode.get_by_host_and_nodename'),
mock.patch('nova.scheduler.utils.resources_from_flavor'),
mock.patch.object(self.compute.reportclient,
'remove_provider_tree_from_instance_allocation')
) as (_get_instances_on_driver, get_instance_nw_info,
_get_instance_block_device_info, _is_instance_storage_shared,
destroy, migration_list, migration_save, get_node,
get_resources, remove_allocation):
destroy, migration_list, migration_save, get_resources,
remove_allocation):
migration_list.return_value = [migration_1, migration_2]
def fake_get_node(context, host, node):
if node == 'fake-node':
return our_node
else:
raise exception.ComputeHostNotFound(host=host)
get_node.side_effect = fake_get_node
get_resources.return_value = mock.sentinel.resources
self.compute._destroy_evacuated_instances(self.context)
self.compute._destroy_evacuated_instances(self.context, node_cache)
# both instance_1 and instance_2 is destroyed in the driver
destroy.assert_has_calls(
@ -4615,8 +4637,6 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
remove_allocation.assert_called_once_with(
self.context, instance_2.uuid, uuids.our_node_uuid)
self.assertEqual(2, get_node.call_count)
def test_destroy_evacuated_instances_not_on_hypervisor(self):
our_host = self.compute.host
flavor = objects.Flavor()
@ -4633,8 +4653,12 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
migration_1.status = 'done'
migration_1.source_node = 'our-node'
our_node = objects.ComputeNode(
host=our_host, uuid=uuids.our_node_uuid)
node_cache = {
uuids.our_node_uuid:
objects.ComputeNode(
uuid=uuids.our_node_uuid,
hypervisor_hostname='our-node')
}
with test.nested(
mock.patch.object(self.compute, '_get_instances_on_driver',
@ -4642,20 +4666,17 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
mock.patch.object(self.compute.driver, 'destroy'),
mock.patch('nova.objects.MigrationList.get_by_filters'),
mock.patch('nova.objects.Migration.save'),
mock.patch('nova.objects.ComputeNode.get_by_host_and_nodename'),
mock.patch('nova.scheduler.utils.resources_from_flavor'),
mock.patch.object(self.compute.reportclient,
'remove_provider_tree_from_instance_allocation'),
mock.patch('nova.objects.Instance.get_by_uuid')
) as (_get_intances_on_driver, destroy, migration_list, migration_save,
get_node, get_resources, remove_allocation,
instance_get_by_uuid):
get_resources, remove_allocation, instance_get_by_uuid):
migration_list.return_value = [migration_1]
instance_get_by_uuid.return_value = instance_1
get_node.return_value = our_node
get_resources.return_value = mock.sentinel.resources
self.compute._destroy_evacuated_instances(self.context)
self.compute._destroy_evacuated_instances(self.context, node_cache)
# nothing to be destroyed as the driver returned no instances on
# the hypervisor
@ -4666,8 +4687,6 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
self.context, instance_1.uuid, uuids.our_node_uuid)
instance_get_by_uuid.assert_called_once_with(
self.context, instance_1.uuid)
get_node.assert_called_once_with(
self.context, our_host, 'our-node')
def test_destroy_evacuated_instances_not_on_hyp_and_instance_deleted(self):
migration_1 = objects.Migration(instance_uuid=uuids.instance_1)
@ -4691,7 +4710,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
instance_get_by_uuid.side_effect = exception.InstanceNotFound(
instance_id=uuids.instance_1)
self.compute._destroy_evacuated_instances(self.context)
self.compute._destroy_evacuated_instances(self.context, {})
# nothing to be destroyed as the driver returned no instances on
# the hypervisor