Updated Branches: refs/heads/4.3-forward 1ae02009b -> 1aa1b3e19
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/1aa1b3e1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1aa1b3e1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1aa1b3e1 Branch: refs/heads/4.3-forward Commit: 1aa1b3e19cfb1e06c35840d6c5bae450d9890a12 Parents: 1ae0200 Author: Marcus Sorensen <mar...@betterservers.com> Authored: Thu Jan 30 23:33:27 2014 -0700 Committer: Marcus Sorensen <mar...@betterservers.com> Committed: Thu Jan 30 23:34:56 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/1aa1b3e1/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);
