Revert "XS host free memory might change, if user manually changes dom0 memory,"
This reverts commit a1d09ae16f08c86bfca5c4a89dec371ef6d3ee67. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/74153e4a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/74153e4a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/74153e4a Branch: refs/heads/ui-restyle Commit: 74153e4a79a064139a6ecce48f8eb1308318beab Parents: 253da8f Author: Anthony Xu <[email protected]> Authored: Wed Nov 13 15:37:45 2013 -0800 Committer: Anthony Xu <[email protected]> Committed: Wed Nov 13 15:38:42 2013 -0800 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 2 +- server/src/com/cloud/capacity/CapacityManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74153e4a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 7a112ae..aadfc17 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -6035,7 +6035,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe Set<VM> vms = host.getResidentVMs(conn); for (VM vm : vms) { if (vm.getIsControlDomain(conn)) { - dom0Ram = vm.getMemoryStaticMax(conn); + dom0Ram = vm.getMemoryDynamicMax(conn); break; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74153e4a/server/src/com/cloud/capacity/CapacityManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java index 19cf70e..70491bc 100755 --- a/server/src/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java @@ -589,7 +589,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, CapacityVO cpuCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_CPU); CapacityVO memCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_MEMORY); - memCap.setTotalCapacity(host.getTotalMemory()); + if (cpuCap != null && memCap != null){ long hostTotalCpu = host.getCpus().longValue() * host.getSpeed().longValue();
