apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5853 cannot deploy vm with differing service storage tag and data disk storage tag

Browse Source 
Changes:
- Reverting Marcus's fix since this issue has already fixed by https://issues.apache.org/jira/browse/CLOUDSTACK-5426
This commit is contained in:
Prachi Damle 2014-11-17 20:27:41 -08:00
parent 48553d7434
commit c5399cdef0
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/com/cloud/deploy/DeploymentPlanner.java
View File

@ -176,11 +176,6 @@ public interface DeploymentPlanner extends Adapter {
_poolIds.add(poolId); _poolIds.add(poolId);
} }
public void removePool(long poolId) {
if (_poolIds != null) {
_poolIds.remove(poolId);
}
}
public void addDataCenter(long dataCenterId) { public void addDataCenter(long dataCenterId) {
if (_dcIds == null) { if (_dcIds == null) {

6
engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
View File

@ -86,12 +86,6 @@ public class ClusterScopeStoragePoolAllocator extends AbstractStoragePoolAllocat
avoid.addPool(pool.getId()); 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 (pools.size() == 0) {
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
s_logger.debug("No storage pools available for " + ServiceOffering.StorageType.shared.toString() + " volume allocation, returning"); s_logger.debug("No storage pools available for " + ServiceOffering.StorageType.shared.toString() + " volume allocation, returning");

5
engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
View File

@ -80,11 +80,6 @@ public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator {
avoid.addPool(pool.getId()); 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) { for (StoragePoolVO storage : storagePools) {
if (suitablePools.size() == returnUpTo) { if (suitablePools.size() == returnUpTo) {