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 63ABF10902 for ; Thu, 22 Aug 2013 21:57:30 +0000 (UTC) Received: (qmail 13046 invoked by uid 500); 22 Aug 2013 21:57:30 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 13030 invoked by uid 500); 22 Aug 2013 21:57:30 -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 13023 invoked by uid 99); 22 Aug 2013 21:57:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Aug 2013 21:57:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0E9E18C3026; Thu, 22 Aug 2013 21:57:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: commits@cloudstack.apache.org Message-Id: <03ea7201e3bb4a109754065ce938a198@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2-forward to 52f08a4 Date: Thu, 22 Aug 2013 21:57:30 +0000 (UTC) Updated Branches: refs/heads/4.2-forward 44b2e5109 -> 52f08a4f3 CLOUDSTACK-4454:object_store - Not able to delete secondary storage when existing snapshots are deleted. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52f08a4f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52f08a4f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52f08a4f Branch: refs/heads/4.2-forward Commit: 52f08a4f36c35ac9827a1d253b000bfcd6f9d723 Parents: 44b2e51 Author: Min Chen Authored: Thu Aug 22 14:56:42 2013 -0700 Committer: Min Chen Committed: Thu Aug 22 14:57:17 2013 -0700 ---------------------------------------------------------------------- .../cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52f08a4f/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java index bee3436..c7549ac 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java @@ -25,7 +25,6 @@ import java.util.Map; import javax.naming.ConfigurationException; -import com.cloud.utils.db.SearchCriteria2; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; @@ -70,6 +69,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase sc = storeSearch.create(); sc.setParameters("store_id", id); sc.setParameters("store_role", role); + sc.setParameters("state", ObjectInDataStoreStateMachine.State.Destroyed); return listBy(sc); }