Updated Branches: refs/heads/master 8ec1f3f8d -> ac649b43e
Revert "Revert "XS host free memory might change, if user manually changes dom0 memory,"" This reverts commit 74153e4a79a064139a6ecce48f8eb1308318beab. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c739ef9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c739ef9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c739ef9 Branch: refs/heads/master Commit: 9c739ef93dd3cf995c6b47cb3ad938cc0be989de Parents: 8ec1f3f Author: Anthony Xu <anthony...@citrix.com> Authored: Thu Nov 14 11:58:55 2013 -0800 Committer: Anthony Xu <anthony...@citrix.com> Committed: Thu Nov 14 11:58:55 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/9c739ef9/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 aadfc17..7a112ae 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.getMemoryDynamicMax(conn); + dom0Ram = vm.getMemoryStaticMax(conn); break; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c739ef9/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 70491bc..19cf70e 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();
