summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-02 23:08:47 +0000
committerGerrit Code Review <review@openstack.org>2012-05-02 23:08:47 +0000
commit922d609480e62f7de156864be527cfe4c8af91f0 (patch)
treeae6de3f8b8e7cc30e7c83534d81a054898ec12b1 /nova/compute
parent4db018636dcc2c083f5dc92a7dd993766337c86c (diff)
parent2511f01f42c7cc57bd17ad06f239723bd19ed1de (diff)
downloadnova-922d609480e62f7de156864be527cfe4c8af91f0.tar.gz
nova-922d609480e62f7de156864be527cfe4c8af91f0.tar.xz
nova-922d609480e62f7de156864be527cfe4c8af91f0.zip
Merge "Use additional task states during resize"
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 3bb5797ce..dca66dd96 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1328,6 +1328,9 @@ class ComputeManager(manager.SchedulerDependentManager):
migration_id,
{'status': 'migrating'})
+ self._instance_update(context, instance_uuid,
+ task_state=task_states.RESIZE_MIGRATING)
+
self._notify_about_instance_usage(
context, instance_ref, "resize.start", network_info=network_info)
@@ -1345,6 +1348,9 @@ class ComputeManager(manager.SchedulerDependentManager):
migration_id,
{'status': 'post-migrating'})
+ self._instance_update(context, instance_uuid,
+ task_state=task_states.RESIZE_MIGRATED)
+
service = self.db.service_get_by_host_and_topic(
context, migration_ref['dest_compute'], FLAGS.compute_topic)
topic = self.db.queue_get_for(context,
@@ -1384,6 +1390,9 @@ class ComputeManager(manager.SchedulerDependentManager):
network_info = self._get_instance_nw_info(context, instance_ref)
+ self._instance_update(context, instance_ref.uuid,
+ task_state=task_states.RESIZE_FINISH)
+
self._notify_about_instance_usage(
context, instance_ref, "finish_resize.start",
network_info=network_info)