openstack
/
nova
Code Issues Proposed changes

Merge "Avoid unbound instance_uuid var during delete" into stable/xena

This commit is contained in:
Zuul 2022-02-11 16:24:50 +00:00 committed by Gerrit Code Review
parent 7f6ec8cf54 00cba39613
commit de36e8c00b
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/compute/api.py
View File

@ -2281,6 +2281,12 @@ class API:
# Normal delete should be attempted.
may_have_ports_or_volumes = compute_utils.may_have_ports_or_volumes(
instance)
# Save a copy of the instance UUID early, in case
# _lookup_instance returns instance = None, to pass to
# _local_delete_cleanup if needed.
instance_uuid = instance.uuid
if not instance.host and not may_have_ports_or_volumes:
try:
if self._delete_while_booting(context, instance):
@ -2294,10 +2300,6 @@ class API:
# full Instance or None if not found. If not found then it's
# acceptable to skip the rest of the delete processing.
# Save a copy of the instance UUID early, in case
# _lookup_instance returns instance = None, to pass to
# _local_delete_cleanup if needed.
instance_uuid = instance.uuid
cell, instance = self._lookup_instance(context, instance.uuid)
if cell and instance:
try:

28
nova/tests/unit/compute/test_api.py
View File

@ -1629,6 +1629,34 @@ class _ComputeAPIUnitTestMixIn(object):
self.compute_api.notifier, self.context, instance)
destroy_mock.assert_called_once_with()
def test_delete_instance_while_booting_host_changes_lookup_fails(self):
"""Tests the case where the instance become scheduled while being
destroyed but then the final lookup fails.
"""
instance = self._create_instance_obj({'host': None})
with test.nested(
mock.patch.object(
self.compute_api, '_delete_while_booting',
side_effect=exception.ObjectActionError(
action="delete", reason="reason")),
mock.patch.object(
self.compute_api, '_lookup_instance',
return_value=(None, None)),
mock.patch.object(self.compute_api, '_local_delete_cleanup')
) as (
_delete_while_booting, _lookup_instance, _local_delete_cleanup
):
self.compute_api._delete(
self.context, instance, 'delete', mock.NonCallableMock())
_delete_while_booting.assert_called_once_with(
self.context, instance)
_lookup_instance.assert_called_once_with(
self.context, instance.uuid)
_local_delete_cleanup.assert_called_once_with(
self.context, instance.uuid)
@mock.patch.object(context, 'target_cell')
@mock.patch.object(objects.InstanceMapping, 'get_by_instance_uuid',
side_effect=exception.InstanceMappingNotFound(