openstack/nova
Code Issues Proposed changes

Merge "Remove useless error handling in prep_resize"

Browse Source
This commit is contained in:
Jenkins 2017-08-28 16:40:32 +00:00 committed by Gerrit Code Review
commit 7b061320fb
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/compute/manager.py
View File

@ -3794,16 +3794,6 @@ class ComputeManager(manager.Manager):
self._prep_resize(context, image, instance,
instance_type, filter_properties,
node, clean_shutdown)
# NOTE(dgenin): This is thrown in LibvirtDriver when the
# instance to be migrated is backed by LVM.
# Remove when LVM migration is implemented.
except exception.MigrationPreCheckError:
# TODO(mriedem): How is it even possible to get here?
# _prep_resize does not call the driver. The resize_instance
# method does, but we RPC cast to the source node to do that
# so we shouldn't even get this exception...
failed = True
raise
except Exception:
failed = True
# try to re-schedule the resize elsewhere: