diff options
| author | Brian Waldon <bcwaldon@gmail.com> | 2012-02-02 16:28:55 -0800 |
|---|---|---|
| committer | Brian Waldon <bcwaldon@gmail.com> | 2012-02-03 14:55:49 -0800 |
| commit | f7deddb89ce63c2ccc7a207461188aeb7a41af32 (patch) | |
| tree | 66ff65dbd66bc6fd3c067bcc2c6ef3824df0a3a0 /nova/compute | |
| parent | f0a11485894f56aba337f65af5f92bede12ef17f (diff) | |
Fix status transition when reverting resize
Present the instance being reverted with a 'REVERT_RESIZE' status instead
of 'ACTIVE' after a revertResize action is triggered. Fixes bug 924371
Change-Id: I12e98733fd00c0794fb9a4acb0cc6752ca02e855
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 4 | ||||
| -rw-r--r-- | nova/compute/manager.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index f54d184dd..aa38f4e7a 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1327,8 +1327,8 @@ class API(base.Base): self.update(context, instance, - vm_state=vm_states.ACTIVE, - task_state=None) + vm_state=vm_states.RESIZING, + task_state=task_states.RESIZE_REVERTING) params = {'migration_id': migration_ref['id']} self._cast_compute_message('revert_resize', context, diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 64401eeca..22c47df2c 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1168,7 +1168,9 @@ class ComputeManager(manager.SchedulerDependentManager): vcpus=instance_type['vcpus'], root_gb=instance_type['root_gb'], ephemeral_gb=instance_type['ephemeral_gb'], - instance_type_id=instance_type['id']) + instance_type_id=instance_type['id'], + vm_state=vm_states.ACTIVE, + task_state=None) self.driver.finish_revert_migration(instance_ref) self.db.migration_update(context, migration_id, |