From 3d0069bb56159a56f9f8e4917fc9faeeae2ba000 Mon Sep 17 00:00:00 2001
From: Prachi Damle <prachi@cloud.com>
Date: Tue, 28 Aug 2012 19:44:00 -0700
Subject: [PATCH] CS-16158 : Load Test - Adding host takes much longer in 3.0.x
 compared to 2.2.14.

Changes:

There is an unnecessary search over capacity table that scans entire table.
---
 server/src/com/cloud/storage/StorageManagerImpl.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 9d4ba0cbbbb..50a78db4786 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -2124,14 +2124,11 @@ public class StorageManagerImpl implements StorageManager, Manager, ClusterManag
     @Override
     public void createCapacityEntry(StoragePoolVO storagePool, short capacityType, long allocated) {
         SearchCriteria<CapacityVO> capacitySC = _capacityDao.createSearchCriteria();
-
-        List<CapacityVO> capacities = _capacityDao.search(capacitySC, null);
-        capacitySC = _capacityDao.createSearchCriteria();
         capacitySC.addAnd("hostOrPoolId", SearchCriteria.Op.EQ, storagePool.getId());
         capacitySC.addAnd("dataCenterId", SearchCriteria.Op.EQ, storagePool.getDataCenterId());
         capacitySC.addAnd("capacityType", SearchCriteria.Op.EQ, capacityType);
 
-        capacities = _capacityDao.search(capacitySC, null);
+        List<CapacityVO> capacities = _capacityDao.search(capacitySC, null);
 
         long totalOverProvCapacity;
         if (storagePool.getPoolType() == StoragePoolType.NetworkFilesystem) {