You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/09/11 19:18:06 UTC
git commit: updated refs/heads/4.2-forward to 362bf5b
Updated Branches:
refs/heads/4.2-forward e74d8a1d1 -> 362bf5b8b
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/362bf5b8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/362bf5b8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/362bf5b8
Branch: refs/heads/4.2-forward
Commit: 362bf5b8b472ed2a75ae712abc724e4d1bf06f35
Parents: e74d8a1
Author: Min Chen <mi...@citrix.com>
Authored: Wed Sep 11 10:10:46 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Wed Sep 11 10:11:05 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/362bf5b8/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 1e68589..2c592b2 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
@@ -577,12 +577,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;
}