Repository: cloudstack Updated Branches: refs/heads/master 890e71cb5 -> 1e72e5a81
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/32ed9d86 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/32ed9d86 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/32ed9d86 Branch: refs/heads/master Commit: 32ed9d86ecafc143696e0c69883f8b7d56a94e55 Parents: 890e71c Author: ynojima <[email protected]> Authored: Tue Jul 1 19:54:11 2014 -0600 Committer: ynojima <[email protected]> Committed: Tue Jul 1 19:54:11 2014 -0600 ---------------------------------------------------------------------- .../storage/allocator/ZoneWideStoragePoolAllocator.java | 11 ----------- 1 file changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32ed9d86/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<Volume> requestVolumes = new ArrayList<Volume>(); - - requestVolumes.add(volume); - - return storageMgr.storagePoolHasEnoughIops(requestVolumes, pool) && storageMgr.storagePoolHasEnoughSpace(requestVolumes, pool); - } - - @Override protected List<StoragePool> reorderPoolsByNumberOfVolumes(DeploymentPlan plan, List<StoragePool> pools, Account account) { if (account == null) { return pools;
