[cloudstack] branch 4.17 updated: XenServer/XCP-ng: fix vm memory usage is always 99.9x% (#6852)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn 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 296035d9a57 XenServer/XCP-ng: fix vm memory usage is always 99.9x% 
(#6852)
296035d9a57 is described below

commit 296035d9a57caa62260a666da726ec45b6801c4b
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Wed Nov 2 09:36:16 2022 +0100

    XenServer/XCP-ng: fix vm memory usage is always 99.9x% (#6852)
    
    According to 
https://docs.citrix.com/en-us/citrix-hypervisor/monitor-performance.html
    The metrics "memory_internal_free" is already in KiB, no need to convert.
    
    "Memory used as reported by the guest agent (KiB). Enabled by default"
---
 .../com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 7462761cd07..f062bac1a59 100644
--- 
a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -3526,7 +3526,7 @@ public abstract class CitrixResourceBase extends 
ServerResourceBase implements S
                 } else if (param.matches("vbd_.*_write")) {
                     
vmStatsAnswer.setDiskWriteKBs(vmStatsAnswer.getDiskWriteKBs() + 
getDataAverage(dataNode, col, numRows) / BASE_TO_CONVERT_BYTES_INTO_KILOBYTES);
                 } else if (param.contains("memory_internal_free")) {
-                    
vmStatsAnswer.setIntFreeMemoryKBs(vmStatsAnswer.getIntFreeMemoryKBs() + 
getDataAverage(dataNode, col, numRows) / BASE_TO_CONVERT_BYTES_INTO_KILOBYTES);
+                    
vmStatsAnswer.setIntFreeMemoryKBs(vmStatsAnswer.getIntFreeMemoryKBs() + 
getDataAverage(dataNode, col, numRows));
                 } else if (param.contains("memory_target")) {
                     
vmStatsAnswer.setTargetMemoryKBs(vmStatsAnswer.getTargetMemoryKBs() + 
getDataAverage(dataNode, col, numRows) / BASE_TO_CONVERT_BYTES_INTO_KILOBYTES);
                 } else if (param.contains("memory")) {