From c5399cdef07cd762d80ae1d26bfbb8a474f9f19b Mon Sep 17 00:00:00 2001
From: Prachi Damle <prachi.damle@citrix.com>
Date: Mon, 17 Nov 2014 20:27:41 -0800
Subject: [PATCH] CLOUDSTACK-5853 cannot deploy vm with differing service
 storage tag and data disk storage tag

Changes:
- Reverting Marcus's fix since this issue has already fixed by https://issues.apache.org/jira/browse/CLOUDSTACK-5426
---
 api/src/com/cloud/deploy/DeploymentPlanner.java             | 5 -----
 .../storage/allocator/ClusterScopeStoragePoolAllocator.java | 6 ------
 .../storage/allocator/ZoneWideStoragePoolAllocator.java     | 5 -----
 3 files changed, 16 deletions(-)

diff --git a/api/src/com/cloud/deploy/DeploymentPlanner.java b/api/src/com/cloud/deploy/DeploymentPlanner.java
index eb62cb178bb..dc7ea6d630c 100644
--- a/api/src/com/cloud/deploy/DeploymentPlanner.java
+++ b/api/src/com/cloud/deploy/DeploymentPlanner.java
@@ -176,11 +176,6 @@ public interface DeploymentPlanner extends Adapter {
             _poolIds.add(poolId);
         }
 
-        public void removePool(long poolId) {
-            if (_poolIds != null) {
-                _poolIds.remove(poolId);
-            }
-        }
 
         public void addDataCenter(long dataCenterId) {
             if (_dcIds == null) {
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
index ea084c75554..0f4df4f1b03 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
@@ -86,12 +86,6 @@ public class ClusterScopeStoragePoolAllocator extends AbstractStoragePoolAllocat
             avoid.addPool(pool.getId());
         }
 
-        // make sure our matching pool was not in avoid set
-        for (StoragePoolVO pool : pools) {
-            s_logger.debug("Removing pool " + pool + " from avoid set, must have been inserted when searching for another disk's tag");
-            avoid.removePool(pool.getId());
-        }
-
         if (pools.size() == 0) {
             if (s_logger.isDebugEnabled()) {
                 s_logger.debug("No storage pools available for " + ServiceOffering.StorageType.shared.toString() + " volume allocation, returning");
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..b38b76f6bfa 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
@@ -80,11 +80,6 @@ public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator {
             avoid.addPool(pool.getId());
         }
 
-        // make sure our matching pool was not in avoid set
-        for (StoragePoolVO pool : storagePoolsByHypervisor) {
-            s_logger.debug("Removing pool " + pool + " from avoid set, must have been inserted when searching for another disk's tag");
-            avoid.removePool(pool.getId());
-        }
 
         for (StoragePoolVO storage : storagePools) {
             if (suitablePools.size() == returnUpTo) {