From f7deddb89ce63c2ccc7a207461188aeb7a41af32 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Thu, 2 Feb 2012 16:28:55 -0800 Subject: 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 --- nova/compute/api.py | 4 ++-- nova/compute/manager.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'nova/compute') 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, -- cgit