openstack/nova
Code Issues Proposed changes

Merge "Update instance state after compute service died for rebuilded instance"

Browse Source
This commit is contained in:
Jenkins
2014-08-31 05:10:46 +00:00
committed by Gerrit Code Review
parent 1087067f46 2bc0877d3c
commit 9caeb2680e
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nova/compute/manager.py
View File

@@ -847,6 +847,19 @@ class ComputeManager(manager.Manager):
instance.save()
return
if (instance.vm_state in [vm_states.ACTIVE, vm_states.STOPPED] and
instance.task_state in [task_states.REBUILDING,
task_states.REBUILD_BLOCK_DEVICE_MAPPING,
task_states.REBUILD_SPAWNING]):
# NOTE(jichenjc) compute stopped before instance was fully
# spawned so set to ERROR state. This is consistent to BUILD
LOG.debug("Instance failed to rebuild correctly, "
"setting to ERROR state", instance=instance)
instance.task_state = None
instance.vm_state = vm_states.ERROR
instance.save()
return
if (instance.vm_state != vm_states.ERROR and
instance.task_state in [task_states.IMAGE_SNAPSHOT_PENDING,
task_states.IMAGE_PENDING_UPLOAD,

21
nova/tests/compute/test_compute_mgr.py
View File

@@ -433,18 +433,33 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
def test_init_instance_reverts_crashed_migration_no_old_state(self):
self._test_init_instance_reverts_crashed_migrations(old_vm_state=None)
def test_init_instance_sets_building_error(self):
def _test_init_instance_sets_building_error(self, vm_state,
task_state=None):
instance = fake_instance.fake_instance_obj(
self.context,
uuid='foo',
vm_state=vm_states.BUILDING,
task_state=None)
vm_state=vm_state,
task_state=task_state)
with mock.patch.object(instance, 'save') as save:
self.compute._init_instance(self.context, instance)
save.assert_called_once_with()
self.assertIsNone(instance.task_state)
self.assertEqual(vm_states.ERROR, instance.vm_state)
def test_init_instance_sets_building_error(self):
self._test_init_instance_sets_building_error(vm_states.BUILDING)
def test_init_instance_sets_rebuilding_errors(self):
tasks = [task_states.REBUILDING,
task_states.REBUILD_BLOCK_DEVICE_MAPPING,
task_states.REBUILD_SPAWNING]
vms = [vm_states.ACTIVE, vm_states.STOPPED]
for vm_state in vms:
for task_state in tasks:
self._test_init_instance_sets_building_error(
vm_state, task_state)
def _test_init_instance_sets_building_tasks_error(self, instance):
with mock.patch.object(instance, 'save') as save:
self.compute._init_instance(self.context, instance)