openstack
/
nova
Code Issues Proposed changes

Merge "libvirt: Ignore DiskNotFound during update_available_resource" into stable/rocky

This commit is contained in:
Zuul 2020-03-10 12:41:52 +00:00 committed by Gerrit Code Review
parent 1f83d773a4 1962633328
commit 88409b52aa
2 changed files with 10 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -15038,30 +15038,6 @@ class LibvirtConnTestCase(test.NoDBTestCase,
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False) drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
self.assertEqual(0, drvr._get_disk_over_committed_size_total()) self.assertEqual(0, drvr._get_disk_over_committed_size_total())
@mock.patch('nova.virt.libvirt.host.Host.list_instance_domains')
@mock.patch('nova.virt.libvirt.driver.LibvirtDriver.'
'_get_instance_disk_info_from_config',
side_effect=exception.DiskNotFound(location='/opt/stack/foo'))
@mock.patch('nova.objects.BlockDeviceMappingList.bdms_by_instance_uuid',
return_value=objects.BlockDeviceMappingList())
@mock.patch('nova.objects.InstanceList.get_by_filters',
return_value=objects.InstanceList(objects=[
objects.Instance(uuid=uuids.instance,
vm_state=vm_states.ACTIVE,
task_state=None)]))
def test_disk_over_committed_size_total_disk_not_found_reraise(
self, mock_get, mock_bdms, mock_get_disk_info, mock_list_domains):
"""Tests that we handle DiskNotFound gracefully for an instance that
is NOT undergoing a task_state transition and the error is re-raised.
"""
mock_dom = mock.Mock()
mock_dom.XMLDesc.return_value = "<domain/>"
mock_dom.UUIDString.return_value = uuids.instance
mock_list_domains.return_value = [mock_dom]
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
self.assertRaises(exception.DiskNotFound,
drvr._get_disk_over_committed_size_total)
@mock.patch('nova.virt.libvirt.storage.lvm.get_volume_size') @mock.patch('nova.virt.libvirt.storage.lvm.get_volume_size')
@mock.patch('nova.virt.disk.api.get_disk_size', @mock.patch('nova.virt.disk.api.get_disk_size',
new_callable=mock.NonCallableMock) new_callable=mock.NonCallableMock)

37
nova/virt/libvirt/driver.py
View File

@ -8201,35 +8201,18 @@ class LibvirtDriver(driver.ComputeDriver):
{'i_name': guest.name}) {'i_name': guest.name})
else: else:
raise raise
except exception.VolumeBDMPathNotFound as e: except (exception.VolumeBDMPathNotFound,
exception.DiskNotFound) as e:
if isinstance(e, exception.VolumeBDMPathNotFound):
thing = 'backing volume block device'
elif isinstance(e, exception.DiskNotFound):
thing = 'backing disk storage'
LOG.warning('Periodic task is updating the host stats, ' LOG.warning('Periodic task is updating the host stats, '
'it is trying to get disk info for %(i_name)s, ' 'it is trying to get disk info for %(i_name)s, '
'but the backing volume block device was removed ' 'but the %(thing)s was removed by a concurrent '
'by concurrent operations such as resize. ' 'operation such as resize. Error: %(error)s',
'Error: %(error)s', {'i_name': guest.name, 'thing': thing, 'error': e})
{'i_name': guest.name, 'error': e})
except exception.DiskNotFound:
with excutils.save_and_reraise_exception() as err_ctxt:
# If the instance is undergoing a task state transition,
# like moving to another host or is being deleted, we
# should ignore this instance and move on.
if guest.uuid in local_instances:
inst = local_instances[guest.uuid]
# bug 1774249 indicated when instance is in RESIZED
# state it might also can't find back disk
if (inst.task_state is not None or
inst.vm_state == vm_states.RESIZED):
LOG.info('Periodic task is updating the host '
'stats; it is trying to get disk info '
'for %(i_name)s, but the backing disk '
'was removed by a concurrent operation '
'(task_state=%(task_state)s) and '
'(vm_state=%(vm_state)s)',
{'i_name': guest.name,
'task_state': inst.task_state,
'vm_state': inst.vm_state},
instance=inst)
err_ctxt.reraise = False
# NOTE(gtt116): give other tasks a chance. # NOTE(gtt116): give other tasks a chance.
greenthread.sleep(0) greenthread.sleep(0)