Merge "Reset the task state after backup done."

1 files changed, 8 insertions, 1 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 2d5baafcf..2b9a9a521 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1149,8 +1149,15 @@ class ComputeManager(manager.SchedulerDependentManager):
                 context, instance, "snapshot.start")
 
         self.driver.snapshot(context, instance, image_id)
+
+        if image_type == 'snapshot':
+            expected_task_state = task_states.IMAGE_SNAPSHOT
+
+        elif image_type == 'backup':
+            expected_task_state = task_states.IMAGE_BACKUP
+
         self._instance_update(context, instance['uuid'], task_state=None,
-                              expected_task_state=task_states.IMAGE_SNAPSHOT)
+                              expected_task_state=expected_task_state)
 
         if image_type == 'snapshot' and rotation:
             raise exception.ImageRotationNotAllowed()