etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7478, CLOUDSTACK-7479: Move pool type filter to seperate method

This commit is contained in:
Kishan Kavala 2014-09-05 17:33:57 +05:30
parent b145a7d140
commit bab81f0d6f
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
View File

@ -180,21 +180,8 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement
return false;
}
if(HypervisorType.LXC.equals(dskCh.getHypervisorType())){
if(Volume.Type.ROOT.equals(dskCh.getType())){
//LXC ROOT disks supports NFS and local storage pools only
if(!(Storage.StoragePoolType.NetworkFilesystem.equals(pool.getPoolType()) ||
Storage.StoragePoolType.Filesystem.equals(pool.getPoolType())) ){
s_logger.debug("StoragePool does not support LXC ROOT disk, skipping this pool");
return false;
}
} else if (Volume.Type.DATADISK.equals(dskCh.getType())){
//LXC DATA disks supports NFS and local storage pools only
if(!Storage.StoragePoolType.RBD.equals(pool.getPoolType())){
s_logger.debug("StoragePool does not support LXC DATA disk, skipping this pool");
return false;
}
}
if(!checkHypervisorCompatibility(dskCh.getHypervisorType(), dskCh.getType(), pool.getPoolType())){
return false;
}
// check capacity
@ -203,4 +190,27 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement
requestVolumes.add(volume);
return storageMgr.storagePoolHasEnoughIops(requestVolumes, pool) && storageMgr.storagePoolHasEnoughSpace(requestVolumes, pool);
}
/*
Check StoragePool and Volume type compatibility for the hypervisor
*/
private boolean checkHypervisorCompatibility(HypervisorType hyperType, Volume.Type volType, Storage.StoragePoolType poolType){
if(HypervisorType.LXC.equals(hyperType)){
if(Volume.Type.ROOT.equals(volType)){
//LXC ROOT disks supports NFS and local storage pools only
if(!(Storage.StoragePoolType.NetworkFilesystem.equals(poolType) ||
Storage.StoragePoolType.Filesystem.equals(poolType)) ){
s_logger.debug("StoragePool does not support LXC ROOT disk, skipping this pool");
return false;
}
} else if (Volume.Type.DATADISK.equals(volType)){
//LXC DATA disks supports RBD storage pool only
if(!Storage.StoragePoolType.RBD.equals(poolType)){
s_logger.debug("StoragePool does not support LXC DATA disk, skipping this pool");
return false;
}
}
}
return true;
}
}