Skip to content

Commit a1d09ae

Browse files
author
Anthony Xu
committed
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.
1 parent 401e0ca commit a1d09ae

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6035,7 +6035,7 @@ protected void fillHostInfo(Connection conn, StartupRoutingCommand cmd) {
60356035
Set<VM> vms = host.getResidentVMs(conn);
60366036
for (VM vm : vms) {
60376037
if (vm.getIsControlDomain(conn)) {
6038-
dom0Ram = vm.getMemoryDynamicMax(conn);
6038+
dom0Ram = vm.getMemoryStaticMax(conn);
60396039
break;
60406040
}
60416041
}

server/src/com/cloud/capacity/CapacityManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ public void updateCapacityForHost(final Host host){
589589

590590
CapacityVO cpuCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_CPU);
591591
CapacityVO memCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_MEMORY);
592-
592+
memCap.setTotalCapacity(host.getTotalMemory());
593593
if (cpuCap != null && memCap != null){
594594

595595
long hostTotalCpu = host.getCpus().longValue() * host.getSpeed().longValue();

0 commit comments

Comments
 (0)