If rescue failed set instance to ERROR

The compute API will allow attempting to rescue an instance that is in
active/stopped/error state.  The compute manager will power off the instance
before calling driver.rescue.

If the rescue call fails in the virt driver, we should set the instance
to ERROR state since we (1) know the instance is definitely not active since
the compute manager powered it off and (2) we don't know what failed in the
virt driver, so punting and putting the instance into ERROR state is better
than leaving it broken and not signaling that with the vm_state.

Co-Authored-By: Matt Riedemann <mriedem@us.ibm.com>

Closes-Bug: 1418590
Change-Id: Ia1054d3f9193f876803f8b5a26d00bd9d5d66c12
This commit is contained in:
George Shuklin 2015-05-01 17:57:00 +03:00 committed by Matt Riedemann
parent ff412c3888
commit a9e4e2c9a5
2 changed files with 3 additions and 3 deletions

View File

@ -3205,6 +3205,7 @@ class ComputeManager(manager.Manager):
except Exception as e:
LOG.exception(_LE("Error trying to Rescue Instance"),
self._set_instance_obj_error_state(context, instance)
raise exception.InstanceNotRescuable(
reason=_("Driver Error: %s") % e)

View File

@ -2208,7 +2208,7 @@ class ComputeTestCase(BaseTestCase):
self.compute.terminate_instance(self.context, instance, [], [])
def test_rescue_handle_err(self):
# If the driver fails to rescue, instance state should remain the same
# If the driver fails to rescue, instance state should got to ERROR
# and the exception should be converted to InstanceNotRescuable
inst_obj = self._create_fake_instance_obj()
self.mox.StubOutWithMock(self.compute, '_get_rescue_image')
@ -2224,7 +2224,6 @@ class ComputeTestCase(BaseTestCase):
expected_message = ('Instance %s cannot be rescued: '
'Driver Error: Try again later' % inst_obj.uuid)
inst_obj.vm_state = 'some_random_state'
with testtools.ExpectedException(
exception.InstanceNotRescuable, expected_message):
@ -2233,7 +2232,7 @@ class ComputeTestCase(BaseTestCase):
rescue_password='password', rescue_image_ref=None,
self.assertEqual('some_random_state', inst_obj.vm_state)
self.assertEqual(vm_states.ERROR, inst_obj.vm_state)
@mock.patch.object(image_api.API, "get")
@mock.patch.object(nova.virt.fake.FakeDriver, "rescue")