openstack
/
nova
Code Issues Proposed changes

Merge "Catch InstanceNotFound exception if migration fails"

This commit is contained in:
Jenkins 2014-05-23 07:07:59 +00:00 committed by Gerrit Code Review
parent b9e876e219 52b57e82c7
commit e30b73cfdc
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nova/tests/virt/libvirt/test_libvirt.py
View File

@ -6720,6 +6720,26 @@ class LibvirtConnTestCase(test.TestCase):
self.assertRaises(exception.ConsoleTypeUnavailable,
conn.get_spice_console, self.context, instance)
def test_detach_volume_with_instance_not_found(self):
# Test that detach_volume() method does not raise exception,
# if the instance does not exist.
instance = self.create_instance_obj(self.context)
conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
with contextlib.nested(
mock.patch.object(conn, '_lookup_by_name',
side_effect=exception.InstanceNotFound(
instance_id=instance.name)),
mock.patch.object(conn, 'volume_driver_method')
) as (_lookup_by_name, volume_driver_method):
connection_info = {'driver_volume_type': 'fake'}
conn.detach_volume(connection_info, instance, '/dev/sda')
_lookup_by_name.assert_called_once_with(instance.name)
volume_driver_method.assert_called_once_with('disconnect_volume',
connection_info,
'sda')
def _test_attach_detach_interface_get_config(self, method_name):
"""Tests that the get_config() method is properly called in
attach_interface() and detach_interface().

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

@ -1383,6 +1383,11 @@ class LibvirtDriver(driver.ComputeDriver):
encryptor = self._get_volume_encryptor(connection_info,
encryption)
encryptor.detach_volume(**encryption)
except exception.InstanceNotFound:
# NOTE(zhaoqin): If the instance does not exist, _lookup_by_name()
# will throw InstanceNotFound exception. Need to
# disconnect volume under this circumstance.
LOG.warn(_LW("During detach_volume, instance disappeared."))
except libvirt.libvirtError as ex:
# NOTE(vish): This is called to cleanup volumes after live
# migration, so we should still disconnect even if