You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2013/07/16 10:44:21 UTC
git commit: updated refs/heads/master to 33d6f7a
Updated Branches:
refs/heads/master 22ddc3fa0 -> 33d6f7a8c
Revert "CLOUDSTACK-3293. DeleteAccount fails with ConstraintViolation on snapshot_store_ref."
This reverts commit 22ddc3fa0644b9dae6bbbc6e87d425d11f574f30.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/33d6f7a8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/33d6f7a8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/33d6f7a8
Branch: refs/heads/master
Commit: 33d6f7a8c49c2edc7fdacaaf23e54751a9f914be
Parents: 22ddc3f
Author: Likitha Shetty <li...@citrix.com>
Authored: Tue Jul 16 14:10:28 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Tue Jul 16 14:10:28 2013 +0530
----------------------------------------------------------------------
.../com/cloud/storage/snapshot/SnapshotManagerImpl.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33d6f7a8/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index 2c9ef82..a67316f 100755
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -676,15 +676,7 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager,
// Either way delete the snapshots for this volume.
List<SnapshotVO> snapshots = listSnapsforVolume(volumeId);
for (SnapshotVO snapshot : snapshots) {
- SnapshotVO snap = _snapshotDao.findById(snapshot.getId());
- SnapshotStrategy snapshotStrategy = null;
- for (SnapshotStrategy strategy : snapshotStrategies) {
- if (strategy.canHandle(snap)) {
- snapshotStrategy = strategy;
- break;
- }
- }
- if (snapshotStrategy.deleteSnapshot(snapshot.getId())) {
+ if (_snapshotDao.expunge(snapshot.getId())) {
if (snapshot.getRecurringType() == Type.MANUAL) {
_resourceLimitMgr.decrementResourceCount(accountId, ResourceType.snapshot);
_resourceLimitMgr.decrementResourceCount(accountId, ResourceType.secondary_storage,