You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by nv...@apache.org on 2022/07/02 02:36:47 UTC
[cloudstack] branch 4.17 updated: Fix VMware memory retrieval (#6414)
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch 4.17
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.17 by this push:
new e467ad02ce Fix VMware memory retrieval (#6414)
e467ad02ce is described below
commit e467ad02ce5e5339ec0a39e67f4739865c55c2fe
Author: João Jandre <48...@users.noreply.github.com>
AuthorDate: Fri Jul 1 23:36:40 2022 -0300
Fix VMware memory retrieval (#6414)
* Fix VMware memory retrieval
* Address review
Co-authored-by: Joao <Jo...@gitlab.com>
---
.../java/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 3b3ebd88ea..f224601dfc 100644
--- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -6535,8 +6535,11 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes
}
}
- final VmStatsEntry vmStats = new VmStatsEntry(0, NumberUtils.toDouble(memkb) * 1024, NumberUtils.toDouble(guestMemusage) * 1024, NumberUtils.toDouble(memlimit) * 1024,
- maxCpuUsage, networkReadKBs, networkWriteKBs, NumberUtils.toInt(numberCPUs), diskReadKbs, diskWriteKbs, diskReadIops, diskWriteIops, "vm");
+ double doubleMemKb = NumberUtils.toDouble(memkb);
+ double guestFreeMem = doubleMemKb - NumberUtils.toDouble(guestMemusage);
+
+ final VmStatsEntry vmStats = new VmStatsEntry(0, doubleMemKb * 1024, guestFreeMem * 1024, NumberUtils.toDouble(memlimit) * 1024, maxCpuUsage, networkReadKBs,
+ networkWriteKBs, NumberUtils.toInt(numberCPUs), diskReadKbs, diskWriteKbs, diskReadIops, diskWriteIops, "vm");
vmResponseMap.put(name, vmStats);
}