You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2014/01/31 07:34:19 UTC
git commit: updated refs/heads/master to d409d70
Updated Branches:
refs/heads/master 7f6b3c08d -> d409d709e
CLOUDSTACK-6000: When expunging fails, move volume state back to
Destroy, so that the cleanup thread will try again on next run.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d409d709
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d409d709
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d409d709
Branch: refs/heads/master
Commit: d409d709e3837a24bc5d2ff88b17ad324cb21e45
Parents: 7f6b3c0
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Thu Jan 30 23:33:27 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Thu Jan 30 23:33:27 2014 -0700
----------------------------------------------------------------------
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/d409d709/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 84f0872..3664884 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);