From 4238ac9e68a87aa98fc19ee8625cf58d35f90003 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Wed, 13 Nov 2013 10:57:19 -0800 Subject: [PATCH] XS host free memory might change, if user manually changes dom0 memory, this patch makes CS update latest XS host free memory on host connect process. --- .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 2 +- server/src/com/cloud/capacity/CapacityManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e3dbdd8ae77..e485458a70f 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 @@ -5929,7 +5929,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe Set vms = host.getResidentVMs(conn); for (VM vm : vms) { if (vm.getIsControlDomain(conn)) { - dom0Ram = vm.getMemoryDynamicMax(conn); + dom0Ram = vm.getMemoryStaticMax(conn); break; } } diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java index 5f9aee60fd8..39f0ca9e4b9 100755 --- a/server/src/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java @@ -593,7 +593,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();