cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/master to a20097b
Date Wed, 11 Sep 2013 17:41:49 GMT
Updated Branches:
  refs/heads/master e958f22ff -> a20097b96


CLOUDSTACK-4534:[object_store_refactor] Deleting uploaded volume is not
deleting the volume from backend.


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

Branch: refs/heads/master
Commit: a20097b967bbe5bba5ee704d03c808c2a54b5268
Parents: e958f22
Author: Min Chen <min.chen@citrix.com>
Authored: Wed Sep 11 10:10:46 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Wed Sep 11 10:25:57 2013 -0700

----------------------------------------------------------------------
 .../apache/cloudstack/storage/volume/VolumeServiceImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a20097b9/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index b40900b..7b4047a 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -566,12 +566,12 @@ public class VolumeServiceImpl implements VolumeService {
     @Override
     @DB
     public boolean destroyVolume(long volumeId) throws ConcurrentOperationException {
-
+        // mark volume entry in volumes table as destroy state
         VolumeInfo vol = volFactory.getVolume(volumeId);
-        vol.processEvent(Event.DestroyRequested);
+        vol.stateTransit(Volume.Event.DestroyRequested);
         snapshotMgr.deletePoliciesForVolume(volumeId);
 
-        vol.processEvent(Event.OperationSuccessed);
+        vol.stateTransit(Volume.Event.OperationSucceeded);
 
         return true;
     }


Mime
View raw message