openstack/nova
Code Issues Proposed changes

Merge "Make sure confirm_resize finishes before setting vm_state to ACTIVE"

Browse Source
This commit is contained in:
Jenkins 2013-04-14 22:24:34 +00:00 committed by Gerrit Code Review
commit 0fc0588a41
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/api.py
View File

@ -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

5
nova/compute/manager.py
View File

@ -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)