Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 47DFA10E50 for ; Mon, 19 Jan 2015 12:33:25 +0000 (UTC) Received: (qmail 57405 invoked by uid 500); 19 Jan 2015 12:33:27 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 57362 invoked by uid 500); 19 Jan 2015 12:33:27 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 57353 invoked by uid 99); 19 Jan 2015 12:33:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jan 2015 12:33:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3090FE0383; Mon, 19 Jan 2015 12:33:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: koushik@apache.org To: commits@cloudstack.apache.org Message-Id: <1a86130ec33c4047aa51b311526d23c1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/volume-upload to cd02ceb Date: Mon, 19 Jan 2015 12:33:27 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/volume-upload ca0f9de6c -> cd02ceb7a volume-upload: gc thread to clean partially uploaded files Added state transitions from error/abandoned to destroyed Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd02ceb7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd02ceb7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd02ceb7 Branch: refs/heads/volume-upload Commit: cd02ceb7a19eefad43cba41ad5cbb0cccdef13d7 Parents: ca0f9de Author: Koushik Das Authored: Mon Jan 19 18:01:29 2015 +0530 Committer: Koushik Das Committed: Mon Jan 19 18:01:29 2015 +0530 ---------------------------------------------------------------------- api/src/com/cloud/storage/Volume.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd02ceb7/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 dbe370c..106e4c2 100755 --- a/api/src/com/cloud/storage/Volume.java +++ b/api/src/com/cloud/storage/Volume.java @@ -111,6 +111,8 @@ public interface Volume extends ControlledEntity, Identity, InternalIdentity, Ba s_fsm.addTransition(new StateMachine2.Transition(UploadInProgress, Event.OperationSucceeded, Uploaded, null)); s_fsm.addTransition(new StateMachine2.Transition(UploadInProgress, Event.OperationFailed, UploadError, null)); s_fsm.addTransition(new StateMachine2.Transition(UploadInProgress, Event.OperationTimeout, UploadError, null)); + s_fsm.addTransition(new StateMachine2.Transition(UploadError, Event.DestroyRequested, Destroy, null)); + s_fsm.addTransition(new StateMachine2.Transition(UploadAbandoned, Event.DestroyRequested, Destroy, null)); } }