Don't update database before resize

Code Issues Proposed changes

Fixes bug lp885815 by ensuring the scheduler doesn't update the database with destination host. Compute manager now updates upon completion of resize.
Change-Id: I3f9ac664c8807e8523802e2485d316a731190764

This commit is contained in:

Gabe Westmaas

2011年11月03日 18:44:51 +00:00

parent 005db2d7d4

commit e45029ced1

2 changed files with 2 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1
nova/compute/api.py

View File

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

1
nova/compute/manager.py

View File

@@ -1123,6 +1123,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,