diff options
| author | Dan Prince <dprince@redhat.com> | 2012-08-14 17:12:13 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2012-08-14 17:12:13 -0400 |
| commit | 0eb53c035ab290c9574c1388bde59f7d05f64efc (patch) | |
| tree | c5dd128d0ddb3550a64959877daf4af616a6d3bb | |
| parent | 3801059632a80a254391ee931e5427c2352ef0c6 (diff) | |
Set task_state=None when finished snapshotting.
Reverts part of recent reverts_task_state commit
d8d7100f8c10ecd388d1943bee9298a913a6990a which removed
code that resets the task_state to None once a snapshot has
been completed.
Fixes LP Bug #1036835.
Change-Id: I7d30d16ca110f022b0d1f6b2fb05ba3aa52fa4d1
| -rw-r--r-- | nova/compute/manager.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index dfa4cf0a1..61703318f 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1178,7 +1178,11 @@ class ComputeManager(manager.SchedulerDependentManager): self._notify_about_instance_usage( context, instance, "snapshot.start") - self.driver.snapshot(context, instance, image_id) + try: + self.driver.snapshot(context, instance, image_id) + finally: + self._instance_update(context, instance['uuid'], + task_state=None) if image_type == 'snapshot' and rotation: raise exception.ImageRotationNotAllowed() |