CLOUDSTACK-6000: When expunging fails, move volume state back to

Marcus Sorensen · chaturvedia · commit 631ea240f48e · 2014-02-02T16:06:36.000-08:00
Destroy, so that the cleanup thread will try again on next run. (cherry picked from commit 1aa1b3e) Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java
@@ -82,7 +82,7 @@ public String getDescription() {
             s_fsm.addTransition(Destroy, Event.ExpungingRequested, Expunging);
             s_fsm.addTransition(Expunging, Event.ExpungingRequested, Expunging);
             s_fsm.addTransition(Expunging, Event.OperationSucceeded, Expunged);
-            s_fsm.addTransition(Expunging, Event.OperationFailed, Expunging);
+            s_fsm.addTransition(Expunging, Event.OperationFailed, Destroy);
             s_fsm.addTransition(Ready, Event.SnapshotRequested, Snapshotting);
             s_fsm.addTransition(Snapshotting, Event.OperationSucceeded, Ready);
             s_fsm.addTransition(Snapshotting, Event.OperationFailed, Ready);
