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

bug 9452: listCapacity - when the hosts > 200 the host_id and storage_pool_id start colliding, to workaround that also compart the capacity type.

This commit is contained in:
Nitin 2011-07-22 19:14:47 +05:30
parent bb3d7013a9
commit bb60543fbf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1668,10 +1668,14 @@ public class ApiResponseHelper implements ResponseGenerator {
// collect all the capacity types, sum allocated/used and sum total...get one capacity number for each
for (Capacity capacity : hostCapacities) {
if (poolIdsToIgnore.contains(capacity.getHostOrPoolId())) {
short capacityType = capacity.getCapacityType();
//If local storage then ignore
if ( (capacityType == Capacity.CAPACITY_TYPE_STORAGE_ALLOCATED || capacityType == Capacity.CAPACITY_TYPE_STORAGE)
&& poolIdsToIgnore.contains(capacity.getHostOrPoolId())) {
continue;
}
short capacityType = capacity.getCapacityType();
String key = capacity.getCapacityType() + "_" + capacity.getDataCenterId();
String keyForPodTotal = key + "_-1";