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

remove capacity

This commit is contained in:
edison 2010-12-01 11:18:27 -08:00
parent 2827ab2e25
commit f3c7012508
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/com/cloud/alert/AlertManagerImpl.java
View File

@ -262,7 +262,8 @@ public class AlertManagerImpl implements AlertManager {
Map<Long, ServiceOfferingVO> offeringsMap = new HashMap<Long, ServiceOfferingVO>();
for (ServiceOfferingVO offering : offerings) {
offeringsMap.put(offering.getId(), offering);
}
}
/*
for (HostVO host : hosts) {
if (host.getType() != Host.Type.Routing) {
continue;
@ -311,7 +312,7 @@ public class AlertManagerImpl implements AlertManager {
CapacityVO newCPUCapacity = new CapacityVO(host.getId(), host.getDataCenterId(), host.getPodId(), cpu, (long)(host.getCpus()*host.getSpeed()* _cpuOverProvisioningFactor), CapacityVO.CAPACITY_TYPE_CPU);
newCapacities.add(newMemoryCapacity);
newCapacities.add(newCPUCapacity);
}
} */
// Calculate storage pool capacity
List<StoragePoolVO> storagePools = _storagePoolDao.listAll();

1
server/src/com/cloud/vm/MauriceMoss.java
View File

@ -363,6 +363,7 @@ public class MauriceMoss implements VmManager, ClusterManagerListener {
throw e;
} catch (StorageUnavailableException e) {
s_logger.warn("Unable to contact storage.", e);
avoids.addCluster(dest.getCluster().getId());
continue;
}
_networkMgr.prepare(vmProfile, dest, context);