cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anim...@apache.org
Subject [4/7] git commit: updated refs/heads/4.3 to 91ec548
Date Mon, 03 Feb 2014 00:24:36 GMT
CLOUDSTACK-6000: When expunging fails, move volume state back to
Destroy, so that the cleanup thread will try again on next run.
(cherry picked from commit 1aa1b3e19cfb1e06c35840d6c5bae450d9890a12)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/631ea240
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/631ea240
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/631ea240

Branch: refs/heads/4.3
Commit: 631ea240f48ea7ff89bf2f611b920c5afd6b3146
Parents: 4809d91
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Thu Jan 30 23:33:27 2014 -0700
Committer: Animesh Chaturvedi <animesh@apache.org>
Committed: Sun Feb 2 16:06:36 2014 -0800

----------------------------------------------------------------------
 api/src/com/cloud/storage/Volume.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/631ea240/api/src/com/cloud/storage/Volume.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java
index b1a253f..fd374dc 100755
--- a/api/src/com/cloud/storage/Volume.java
+++ b/api/src/com/cloud/storage/Volume.java
@@ -82,7 +82,7 @@ public interface Volume extends ControlledEntity, Identity, InternalIdentity,
Ba
             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);


Mime
View raw message