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 692FF10320 for ; Mon, 24 Nov 2014 22:29:52 +0000 (UTC) Received: (qmail 23217 invoked by uid 500); 24 Nov 2014 22:29:52 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 23189 invoked by uid 500); 24 Nov 2014 22:29:52 -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 23180 invoked by uid 99); 24 Nov 2014 22:29:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Nov 2014 22:29:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EAA11A17CE6; Mon, 24 Nov 2014 22:29:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 4e5b3d0 Date: Mon, 24 Nov 2014 22:29:51 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 73087bc3f -> 4e5b3d028 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/4e5b3d02 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e5b3d02 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e5b3d02 Branch: refs/heads/master Commit: 4e5b3d028dc990f27484b79db67926c4371715ac Parents: 73087bc Author: Edison Su Authored: Mon Nov 24 14:25:29 2014 -0800 Committer: Edison Su Committed: Mon Nov 24 14:27:56 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/4e5b3d02/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 1184320..e78a015 100644 --- 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()); }