diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-04 01:54:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-04 01:54:21 +0000 |
| commit | 7c5fa147eaf2133485255b0558afd4cd6ce42bc3 (patch) | |
| tree | aee6462a45497f1576ade6b7748a7b21f408a6e1 | |
| parent | 15b2e713d50d9c0ef1adbf769f598b030bb0c29a (diff) | |
| parent | e45029ced19a3d80e006f917f0111c69f976cda1 (diff) | |
| download | nova-7c5fa147eaf2133485255b0558afd4cd6ce42bc3.tar.gz nova-7c5fa147eaf2133485255b0558afd4cd6ce42bc3.tar.xz nova-7c5fa147eaf2133485255b0558afd4cd6ce42bc3.zip | |
Merge "Don't update database before resize"
| -rw-r--r-- | nova/compute/api.py | 1 | ||||
| -rw-r--r-- | nova/compute/manager.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index b6ba86eb3..0d6498693 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1321,6 +1321,7 @@ class API(base.Base): {"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 index f16b72a57..4a51147a2 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1131,6 +1131,7 @@ class ComputeManager(manager.SchedulerDependentManager): 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, |