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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c5399cde Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c5399cde Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c5399cde Branch: refs/heads/master Commit: c5399cdef07cd762d80ae1d26bfbb8a474f9f19b Parents: 48553d7 Author: Prachi Damle <prachi.da...@citrix.com> Authored: Mon Nov 17 20:27:41 2014 -0800 Committer: Prachi Damle <prachi.da...@citrix.com> Committed: Tue Nov 18 09:47:23 2014 -0800 ---------------------------------------------------------------------- api/src/com/cloud/deploy/DeploymentPlanner.java | 5 ----- .../storage/allocator/ClusterScopeStoragePoolAllocator.java | 6 ------ .../storage/allocator/ZoneWideStoragePoolAllocator.java | 5 ----- 3 files changed, 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5399cde/api/src/com/cloud/deploy/DeploymentPlanner.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/deploy/DeploymentPlanner.java b/api/src/com/cloud/deploy/DeploymentPlanner.java index eb62cb1..dc7ea6d 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) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5399cde/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java ---------------------------------------------------------------------- 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 ea084c7..0f4df4f 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"); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5399cde/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 f9abfde..b38b76f 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) {
