Merge "Set migration status to 'error' on live-migration failure"

nova/compute/manager.py

@@ -5113,7 +5113,7 @@ class ComputeManager(manager.Manager):
             with excutils.save_and_reraise_exception():
                 LOG.exception(_LE('Pre live migration failed at %s'),
                               dest, instance=instance)
-                self._set_migration_status(migration, 'failed')
+                self._set_migration_status(migration, 'error')
                 self._rollback_live_migration(context, instance, dest,
                                               block_migration, migrate_data)
 
@@ -5133,7 +5133,7 @@ class ComputeManager(manager.Manager):
             # nothing must be recovered in this version.
             LOG.exception(_LE('Live migration failed.'), instance=instance)
             with excutils.save_and_reraise_exception():
-                self._set_migration_status(migration, 'failed')
+                self._set_migration_status(migration, 'error')
 
     @wrap_exception()
     @wrap_instance_event

nova/conductor/manager.py

@@ -345,7 +345,7 @@ class ComputeTaskManager(base.Base):
                       exc_info=True)
             _set_vm_state(context, instance, ex, vm_states.ERROR,
                           instance.task_state)
-            migration.status = 'failed'
+            migration.status = 'error'
             migration.save()
             raise exception.MigrationError(reason=six.text_type(ex))
 

nova/tests/unit/compute/test_compute.py

@@ -5676,7 +5676,7 @@ class ComputeTestCase(BaseTestCase):
         self.assertEqual('src_host', instance.host)
         self.assertEqual(vm_states.ACTIVE, instance.vm_state)
         self.assertIsNone(instance.task_state)
-        self.assertEqual('failed', migration.status)
+        self.assertEqual('error', migration.status)
 
     @mock.patch.object(compute_utils, 'EventReporter')
     @mock.patch('nova.objects.Migration.save')