From 32ed9d86ecafc143696e0c69883f8b7d56a94e55 Mon Sep 17 00:00:00 2001
From: ynojima <mail@ynojima.net>
Date: Tue, 1 Jul 2014 19:54:11 -0600
Subject: [PATCH] Revert "Fixing an issue introduced with Review Request 22717"

This reverts commit 12e92e10ffbd9f86ebff11c2a1b22c5bafafb3d1.
---
 .../allocator/ZoneWideStoragePoolAllocator.java       | 11 -----------
 1 file changed, 11 deletions(-)

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 8246a8098d7..f9abfde4553 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;
@@ -101,16 +100,6 @@ public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator {
         return suitablePools;
     }
 
-    @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) {