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

Changes for Bug 8997 - Fail to create volume from snapshot: NPE at "allocateToPool(FirstFitStoragePoolAllocator.java:63)

Browse Source 
- ClusterId passed in could be null
This commit is contained in:
prachi 2011-03-15 18:40:09 -07:00
parent 63593c5057
commit 2076eec42b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
View File

@ -90,8 +90,8 @@ public class FirstFitAllocator implements HostAllocator {
ExcludeList avoid, int returnUpTo) { ExcludeList avoid, int returnUpTo) {
long dcId = plan.getDataCenterId(); long dcId = plan.getDataCenterId();
long podId = plan.getPodId(); Long podId = plan.getPodId();
long clusterId = plan.getClusterId(); Long clusterId = plan.getClusterId();
ServiceOffering offering = vmProfile.getServiceOffering(); ServiceOffering offering = vmProfile.getServiceOffering();
VMTemplateVO template = (VMTemplateVO)vmProfile.getTemplate(); VMTemplateVO template = (VMTemplateVO)vmProfile.getTemplate();

4
server/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
View File

@ -53,8 +53,8 @@ public class RandomAllocator implements HostAllocator {
ExcludeList avoid, int returnUpTo) { ExcludeList avoid, int returnUpTo) {
long dcId = plan.getDataCenterId(); long dcId = plan.getDataCenterId();
long podId = plan.getPodId(); Long podId = plan.getPodId();
long clusterId = plan.getClusterId(); Long clusterId = plan.getClusterId();
ServiceOffering offering = vmProfile.getServiceOffering(); ServiceOffering offering = vmProfile.getServiceOffering();
List<Host> suitableHosts = new ArrayList<Host>(); List<Host> suitableHosts = new ArrayList<Host>();

4
server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java
View File

@ -59,8 +59,8 @@ public class FirstFitStoragePoolAllocator extends AbstractStoragePoolAllocator {
return suitablePools; return suitablePools;
} }
long dcId = plan.getDataCenterId(); long dcId = plan.getDataCenterId();
long podId = plan.getPodId(); Long podId = plan.getPodId();
long clusterId = plan.getClusterId(); Long clusterId = plan.getClusterId();
if(dskCh.getTags() != null && dskCh.getTags().length != 0){ if(dskCh.getTags() != null && dskCh.getTags().length != 0){
s_logger.debug("Looking for pools in dc: " + dcId + " pod:" + podId + " cluster:" + clusterId + " having tags:" + Arrays.toString(dskCh.getTags())); s_logger.debug("Looking for pools in dc: " + dcId + " pod:" + podId + " cluster:" + clusterId + " having tags:" + Arrays.toString(dskCh.getTags()));

4
server/src/com/cloud/storage/allocator/RandomStoragePoolAllocator.java
View File

@ -57,8 +57,8 @@ public class RandomStoragePoolAllocator extends AbstractStoragePoolAllocator {
return suitablePools; return suitablePools;
} }
long dcId = plan.getDataCenterId(); long dcId = plan.getDataCenterId();
long podId = plan.getPodId(); Long podId = plan.getPodId();
long clusterId = plan.getClusterId(); Long clusterId = plan.getClusterId();
s_logger.debug("Looking for pools in dc: " + dcId + " pod:" + podId + " cluster:" + clusterId); s_logger.debug("Looking for pools in dc: " + dcId + " pod:" + podId + " cluster:" + clusterId);
List<StoragePoolVO> pools = _storagePoolDao.listBy(dcId, podId, clusterId); List<StoragePoolVO> pools = _storagePoolDao.listBy(dcId, podId, clusterId);
if (pools.size() == 0) { if (pools.size() == 0) {