You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2014/11/24 23:30:51 UTC
git commit: updated refs/heads/4.5 to 7175247
Repository: cloudstack
Updated Branches:
refs/heads/4.5 a52fd08a1 -> 7175247c5
CLOUDSTACK-7966:
remove snapshot_store_ref entry, in which role is Primary, during
storage GC
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7175247c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7175247c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7175247c
Branch: refs/heads/4.5
Commit: 7175247c5e10eb6c152b2629e5496337e3287afd
Parents: a52fd08
Author: Edison Su <su...@gmail.com>
Authored: Mon Nov 24 14:25:29 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Mon Nov 24 14:30:32 2014 -0800
----------------------------------------------------------------------
server/src/com/cloud/storage/StorageManagerImpl.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7175247c/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 153c25a..0b8a43b 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1176,6 +1176,10 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
}
_snapshotDao.remove(destroyedSnapshotStoreVO.getSnapshotId());
+ SnapshotDataStoreVO snapshotOnPrimary = _snapshotStoreDao.findBySnapshot(destroyedSnapshotStoreVO.getSnapshotId(), DataStoreRole.Primary);
+ if (snapshotOnPrimary != null) {
+ _snapshotStoreDao.remove(snapshotOnPrimary.getId());
+ }
_snapshotStoreDao.remove(destroyedSnapshotStoreVO.getId());
}