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

bug 7655 : The dashboard would use the reserved capacity + used capacity in the op_host_Capacity to reflect the total used capacity. Reserved capacity corresponds to the stopped vms within a specific interval called vm.resource.release.interval 

status 7655 : resolved fixed
This commit is contained in:
nit 2011-01-14 18:01:08 +05:30
parent e7108948ac
commit e0f03a4f89
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -1972,7 +1972,7 @@ public class ApiResponseHelper implements ResponseGenerator {
if (poolIdsToIgnore.contains(capacity.getHostOrPoolId())) {
continue;
}
short capacityType = capacity.getCapacityType();
String key = capacity.getCapacityType() + "_" + capacity.getDataCenterId();
String keyForPodTotal = key + "_-1";
@ -1994,7 +1994,11 @@ public class ApiResponseHelper implements ResponseGenerator {
if (usedCapacity == null) {
usedCapacity = new Long(capacity.getUsedCapacity());
} else {
usedCapacity = new Long(capacity.getUsedCapacity() + usedCapacity);
usedCapacity = new Long(capacity.getUsedCapacity() + usedCapacity);
}
if (capacityType == Capacity.CAPACITY_TYPE_CPU || capacityType == Capacity.CAPACITY_TYPE_MEMORY){ // Reserved Capacity accounts for stopped vms that have been stopped within an interval
usedCapacity += capacity.getReservedCapacity();
}
totalCapacityMap.put(key, totalCapacity);
@ -2015,7 +2019,11 @@ public class ApiResponseHelper implements ResponseGenerator {
} else {
usedCapacity = new Long(capacity.getUsedCapacity() + usedCapacity);
}
if (capacityType == Capacity.CAPACITY_TYPE_CPU || capacityType == Capacity.CAPACITY_TYPE_MEMORY){ // Reserved Capacity accounts for stopped vms that have been stopped within an interval
usedCapacity += capacity.getReservedCapacity();
}
totalCapacityMap.put(keyForPodTotal, totalCapacity);
usedCapacityMap.put(keyForPodTotal, usedCapacity);
}