diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-14 22:24:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-14 22:24:34 +0000 |
| commit | 0fc0588a41d85a61695f4fa0aab238784ffe5999 (patch) | |
| tree | 080a51f2e301db5eefb9e7b459d0f9fea6b827eb | |
| parent | 497b42372d820bb9bf2c9dfd482e5abf9ef1f940 (diff) | |
| parent | fd26589afa2852762575feaae95a0c9b0c091461 (diff) | |
Merge "Make sure confirm_resize finishes before setting vm_state to ACTIVE"
| -rw-r--r-- | nova/compute/api.py | 4 | ||||
| -rwxr-xr-x | nova/compute/manager.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 493a6c882..6539719ef 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1863,10 +1863,6 @@ class API(base.Base): deltas = self._downsize_quota_delta(context, instance) reservations = self._reserve_quota_delta(context, deltas) - instance = self.update(context, instance, vm_state=vm_states.ACTIVE, - task_state=None, - expected_task_state=None) - self.db.migration_update(elevated, migration_ref['id'], {'status': 'confirming'}) # With cells, the best we can do right now is commit the reservations diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 9c11ce1f7..dc0725933 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2122,6 +2122,11 @@ class ComputeManager(manager.SchedulerDependentManager): rt = self._get_resource_tracker(migration['source_node']) rt.confirm_resize(context, migration) + instance = self._instance_update(context, instance['uuid'], + vm_state=vm_states.ACTIVE, + task_state=None, + expected_task_state=None) + self._notify_about_instance_usage( context, instance, "resize.confirm.end", network_info=network_info) |