Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion nova/virt/libvirt/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -11795,7 +11795,21 @@ def migrate_disk_and_power_off(self, context, instance, migration,
connection_info = vol['connection_info']
self._disconnect_volume(context, connection_info, instance)

disk_info = self._get_instance_disk_info(instance, block_device_info)
# For boot-from-volume instances the domain may already be gone from
# libvirt (e.g. on a migration retry) but there are no local disks to
# copy, so InstanceNotFound is safe to ignore here.
if booted_from_volume:
try:
disk_info = self._get_instance_disk_info(instance,
block_device_info)
except exception.InstanceNotFound:
LOG.debug('Libvirt domain not found for boot-from-volume '
'instance during migration, no local disks to '
'copy.', instance=instance)
disk_info = []
else:
disk_info = self._get_instance_disk_info(instance,
block_device_info)

try:
# If cleanup failed in previous resize attempts we try to remedy
Expand Down