Merge branch 'feature-5.1.0-memory-reclamation@@3' into '5.1.0'

<fix>[prometheus]: keep ksm metric use /sys/kernel/mm/ksm/pages_shared

See merge request zstackio/zstack-utility!4648

Author: gitlab

baremetalpxeserver/baremetalpxeserver/pxeserveragent.py

@@ -315,11 +315,12 @@ def init(self, req):
             f.write(grub_cfg)
 
         # remove symlink if exists
-        if os.path.exists(self.UEFI_BOOT_GRUB_CFG):
+        if os.path.exists(self.UEFI_BOOT_GRUB_CFG) and os.path.islink(self.UEFI_BOOT_GRUB_CFG):
             os.remove(self.UEFI_BOOT_GRUB_CFG)
 
         # create link for grub.cfg (for get baremetal hardinfo)
         rel_path = os.path.relpath(self.UEFI_DEFAULT_GRUB_CFG, os.path.dirname(self.UEFI_BOOT_GRUB_CFG))
+
         os.symlink(rel_path, self.UEFI_BOOT_GRUB_CFG)
 
         # init inspector_ks.cfg
@@ -532,7 +533,7 @@ def _create_pxelinux_cfg(self, cmd):
         grub_link_cfg_file = os.path.join(self.TFTPBOOT_PATH, "grub.cfg-01-" + ks_cfg_name)
 
         # remove symlink if exists
-        if os.path.exists(grub_link_cfg_file):
+        if os.path.exists(grub_link_cfg_file) and os.path.islink(grub_link_cfg_file):
             os.remove(grub_link_cfg_file)
 
         rel_path = os.path.relpath(grub_cfg_file, os.path.dirname(grub_link_cfg_file))

kvmagent/kvmagent/plugins/prometheus.py

@@ -1163,7 +1163,7 @@ def collect_memory_overcommit_statistics():
     metrics = {
         'host_ksm_pages_shared_in_bytes': GaugeMetricFamily('host_ksm_pages_shared_in_bytes',
                                                'host ksm shared pages', None, []),
-        'host_ksm_pages_shareing_in_bytes': GaugeMetricFamily('host_ksm_pages_shareing_in_bytes',
+        'host_ksm_pages_sharing_in_bytes': GaugeMetricFamily('host_ksm_pages_sharing_in_bytes',
                                                   'host ksm sharing pages', None, []),
         'host_ksm_pages_unshared_in_bytes': GaugeMetricFamily('host_ksm_pages_unshared_in_bytes',
                                                     'host ksm unshared pages', None, []),
@@ -1181,18 +1181,11 @@ def collect_memory_overcommit_statistics():
     # read metric from /sys/kernel/mm/ksm
     value = linux.read_file("/sys/kernel/mm/ksm/pages_shared")
     if value:
-        shared_pages = value
-        sharing_pages = linux.read_file("/sys/kernel/mm/ksm/pages_sharing")
-        pages_num = float(sharing_pages.strip()) - float(shared_pages.strip())
-
-        if (pages_num < 0):
-            pages_num = 0
-
-        metrics['host_ksm_pages_shared_in_bytes'].add_metric([], pages_num * PAGE_SIZE)
+        metrics['host_ksm_pages_shared_in_bytes'].add_metric([], float(value.strip()) * PAGE_SIZE)
 
     value = linux.read_file("/sys/kernel/mm/ksm/pages_sharing")
     if value:
-        metrics['host_ksm_pages_shareing_in_bytes'].add_metric([], float(value.strip()) * PAGE_SIZE)
+        metrics['host_ksm_pages_sharing_in_bytes'].add_metric([], float(value.strip()) * PAGE_SIZE)
 
     value = linux.read_file("/sys/kernel/mm/ksm/pages_unshared")
     if value:

kvmagent/kvmagent/plugins/vm_plugin.py

@@ -4694,8 +4694,11 @@ def make_memory_backing():
             backing = e(root, 'memoryBacking')
             if cmd.useHugePage:
                 e(backing, "hugepages")
-                e(backing, "nosharepages")
                 e(backing, "allocation", attrib={'mode': 'immediate'})
+
+            if cmd.noSharePages or cmd.useHugePage:
+                e(backing, "nosharepages")
+
             if cmd.MemAccess in "shared":
                 # <access mode="shared|private"/>
                 e(backing, "access", attrib={'mode': 'shared'})