Merge "Remove TODO from ComputeTaskManager._live_migrate"
This commit is contained in:
commit
c06374862e
|
@ -482,7 +482,6 @@ class ComputeTaskManager(base.Base):
|
||||||
exception.MigrationPreCheckError,
|
exception.MigrationPreCheckError,
|
||||||
exception.MigrationSchedulerRPCError) as ex:
|
exception.MigrationSchedulerRPCError) as ex:
|
||||||
with excutils.save_and_reraise_exception():
|
with excutils.save_and_reraise_exception():
|
||||||
# TODO(johngarbutt) - eventually need instance actions here
|
|
||||||
_set_vm_state(context, instance, ex, instance.vm_state)
|
_set_vm_state(context, instance, ex, instance.vm_state)
|
||||||
migration.status = 'error'
|
migration.status = 'error'
|
||||||
migration.save()
|
migration.save()
|
||||||
|
|
Loading…
Reference in New Issue