Merge "Ensure instance is moved to ERROR on suspend failure"

2 files changed, 19 insertions, 1 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 55cff40d0..559d7c33d 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1793,7 +1793,8 @@ class ComputeManager(manager.SchedulerDependentManager):
             instance = self.db.instance_get_by_uuid(context, instance_uuid)
 
         LOG.audit(_('Suspending'), context=context, instance=instance)
-        self.driver.suspend(instance)
+        with self.error_out_instance_on_exception(context, instance['uuid']):
+            self.driver.suspend(instance)
 
         current_power_state = self._get_power_state(context, instance)
         self._instance_update(context,
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 892675a77..603ef23f2 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -508,6 +508,23 @@ class ComputeTestCase(BaseTestCase):
         self.compute.resume_instance(self.context, instance_uuid)
         self.compute.terminate_instance(self.context, instance_uuid)
 
+    def test_suspend_error(self):
+        """Ensure vm_state is ERROR when suspend error occurs"""
+        def fake(*args, **kwargs):
+            raise test.TestingException()
+        self.stubs.Set(self.compute.driver, 'suspend', fake)
+
+        instance = self._create_fake_instance()
+        instance_uuid = instance['uuid']
+        self.compute.run_instance(self.context, instance_uuid)
+        self.assertRaises(test.TestingException,
+                          self.compute.suspend_instance,
+                          self.context,
+                          instance=jsonutils.to_primitive(instance))
+        instance = db.instance_get_by_uuid(self.context, instance_uuid)
+        self.assertEqual(instance['vm_state'], vm_states.ERROR)
+        self.compute.terminate_instance(self.context, instance_uuid)
+
     def test_rebuild(self):
         """Ensure instance can be rebuilt"""
         instance = self._create_fake_instance()