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 A1811113E9 for ; Fri, 27 Jun 2014 08:20:37 +0000 (UTC) Received: (qmail 50966 invoked by uid 500); 27 Jun 2014 08:20:37 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 50933 invoked by uid 500); 27 Jun 2014 08:20:37 -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 50917 invoked by uid 99); 27 Jun 2014 08:20:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jun 2014 08:20:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2A89A98D317; Fri, 27 Jun 2014 08:20:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ynojima@apache.org To: commits@cloudstack.apache.org Date: Fri, 27 Jun 2014 08:20:37 -0000 Message-Id: <9c89541232bd4c5d99ef49706d2a6388@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/remove-root-disk-filtering-logic-for-iscsi-storage to 51cfff4 Repository: cloudstack Updated Branches: refs/heads/remove-root-disk-filtering-logic-for-iscsi-storage [created] 51cfff41a Revert "Fixing an issue introduced with Review Request 22717" This reverts commit 12e92e10ffbd9f86ebff11c2a1b22c5bafafb3d1. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e5e142f0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e5e142f0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e5e142f0 Branch: refs/heads/remove-root-disk-filtering-logic-for-iscsi-storage Commit: e5e142f08fe3454dbf4cf1bece2e5c3d1a680bc2 Parents: 12e92e1 Author: ynojima Authored: Fri Jun 27 00:49:51 2014 -0600 Committer: ynojima Committed: Fri Jun 27 00:49:51 2014 -0600 ---------------------------------------------------------------------- .../storage/allocator/ZoneWideStoragePoolAllocator.java | 11 ----------- 1 file changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5e142f0/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java index 8246a80..f9abfde 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java @@ -34,7 +34,6 @@ import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.StoragePool; -import com.cloud.storage.Volume; import com.cloud.user.Account; import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachineProfile; @@ -102,16 +101,6 @@ public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator { } @Override - protected boolean filter(ExcludeList avoid, StoragePool pool, DiskProfile dskCh, DeploymentPlan plan) { - Volume volume = _volumeDao.findById(dskCh.getVolumeId()); - List requestVolumes = new ArrayList(); - - requestVolumes.add(volume); - - return storageMgr.storagePoolHasEnoughIops(requestVolumes, pool) && storageMgr.storagePoolHasEnoughSpace(requestVolumes, pool); - } - - @Override protected List reorderPoolsByNumberOfVolumes(DeploymentPlan plan, List pools, Account account) { if (account == null) { return pools;