summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/compute/api.py4
-rwxr-xr-xnova/compute/manager.py5
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 19c8ee1a2..f020071df 100755
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -2081,6 +2081,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)