Merge "Don't update database before resize"

openstack · Nov 4, 2011 · 7c5fa14 · 7c5fa14
2 parents 15b2e71 + e45029c
commit 7c5fa14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/nova/compute/api.py b/nova/compute/api.py
@@ -1321,6 +1321,7 @@ def resize(self, context, instance_id, flavor_id=None):
                     {"method": "prep_resize",
                      "args": {"topic": FLAGS.compute_topic,
                               "instance_id": instance_ref['uuid'],
+                              "update_db": False,
                               "instance_type_id": new_instance_type['id']}})
 
     @scheduler_api.reroute_compute("add_fixed_ip")

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
@@ -1131,6 +1131,7 @@ def finish_resize(self, context, instance_id, migration_id, disk_info):
         self._instance_update(context,
                               instance_id,
                               vm_state=vm_states.ACTIVE,
+                              host=migration_ref['dest_compute'],
                               task_state=task_states.RESIZE_VERIFY)
 
         self.db.migration_update(context, migration_id,