From 8c5c58dc35cb0205cc297cae56676ed6fabb3bc3 Mon Sep 17 00:00:00 2001 From: nit Date: Fri, 15 Apr 2011 17:05:01 +0530 Subject: [PATCH] bug 9059: Host Details would account for Stopped VM's as well - basically they will take into account the reserved_capacity from op_host_Capacity table status 9059: resolved fixed --- .../cloud/server/ManagementServerImpl.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index b0982aa956a..afc1562f5cb 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -3275,25 +3275,10 @@ public class ManagementServerImpl implements ManagementServer { @Override public long getMemoryUsagebyHost(Long hostId) { - long mem = 0; - List vms = _vmInstanceDao.listUpByHostIdTypes(hostId, VirtualMachine.Type.DomainRouter); - mem += vms.size() * _routerRamSize * 1024L * 1024L; - - vms = _vmInstanceDao.listUpByHostIdTypes(hostId, VirtualMachine.Type.SecondaryStorageVm); - mem += vms.size() * _ssRamSize * 1024L * 1024L; + + CapacityVO capacity = _capacityDao.findByHostIdType(hostId, CapacityVO.CAPACITY_TYPE_MEMORY); + return capacity == null ? 0 : capacity.getReservedCapacity() + capacity.getUsedCapacity(); - vms = _vmInstanceDao.listUpByHostIdTypes(hostId, VirtualMachine.Type.ConsoleProxy); - mem += vms.size() * _proxyRamSize * 1024L * 1024L; - - - List instances = _userVmDao.listUpByHostId(hostId); - for (UserVmVO vm : instances) { - ServiceOffering so = findServiceOfferingById(vm.getServiceOfferingId()); - if (so != null) { - mem += so.getRamSize() * 1024L * 1024L; - } - } - return mem; } @Override