From 12e92e10ffbd9f86ebff11c2a1b22c5bafafb3d1 Mon Sep 17 00:00:00 2001
From: Mike Tutkowski <mike.tutkowski@solidfire.com>
Date: Thu, 26 Jun 2014 23:56:11 -0600
Subject: [PATCH] Fixing an issue introduced with Review Request 22717

---
 .../allocator/ZoneWideStoragePoolAllocator.java       | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 f9abfde4553..8246a8098d7 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
@@ -34,6 +34,7 @@ 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;
@@ -100,6 +101,16 @@ 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) {