Merge pull request #9268 from GuoLiBin6/feat/glb-to-4.0/src

feat: server show numa info

Author: GuoLiBin6

containers/Compute/locales/en.json

@@ -626,6 +626,7 @@
   "compute.text_606": "Resource Statistics",
   "compute.text_607": "Transparent Device",
   "compute.text_608": "Metrics",
+  "compute.text_609": "NUMA binding",
   "compute.passthrough_device_count": "#Passthrough Device",
   "compute.host.host_type.title": "Virtualization",
   "compute.host.host_enable_numa_allocate.title": "NUMA Core Binding",

containers/Compute/locales/ja-JP.json

@@ -626,6 +626,7 @@
   "compute.text_606": "リソース統計",
   "compute.text_607": "透明伝送装置",
   "compute.text_608": "モニター",
+  "compute.text_609": "NUMAバインド",
   "compute.passthrough_device_count": "透過伝送装置数",
   "compute.host.host_type.title": "仮想化",
   "compute.host.host_enable_numa_allocate.title": "NUMAコアバインディング",

containers/Compute/locales/zh-CN.json

@@ -626,6 +626,7 @@
   "compute.text_606": "资源统计",
   "compute.text_607": "透传设备",
   "compute.text_608": "监控",
+  "compute.text_609": "NUMA绑核",
   "compute.passthrough_device_count": "透传设备数量",
   "compute.host.host_type.title": "虚拟化技术",
   "compute.host.host_enable_numa_allocate.title": "NUMA绑核",

containers/Compute/views/vminstance-container/sidepage/Detail.vue

@@ -36,6 +36,7 @@ import WindowsMixin from '@/mixins/windows'
 import { findPlatform } from '@/utils/common/hypervisor'
 import { HYPERVISORS_MAP } from '@/constants'
 import { sizestr } from '@/utils/utils'
+import { formatCpuNumaPin } from '@Compute/views/vminstance/utils'
 
 export default {
   name: 'VmContainerInstanceDetail',
@@ -229,6 +230,13 @@ export default {
               },
               hidden: () => this.$isScopedPolicyMenuHidden('server_hidden_columns.vmem_size'),
             },
+            {
+              field: 'cpu_numa_pin',
+              title: this.$t('compute.text_609'),
+              formatter: ({ row }) => {
+                return formatCpuNumaPin(row)
+              },
+            },
             {
               field: 'dataDisk',
               title: this.$t('compute.text_50'),

containers/Compute/views/vminstance/sidepage/Detail.vue

@@ -36,6 +36,7 @@ import { findPlatform } from '@/utils/common/hypervisor'
 import { BRAND_MAP, HYPERVISORS_MAP } from '@/constants'
 import { sizestr, sizestrWithUnit } from '@/utils/utils'
 import { hasPermission } from '@/utils/auth'
+import { formatCpuNumaPin } from '@Compute/views/vminstance/utils'
 
 export default {
   name: 'VmInstanceDetail',
@@ -426,6 +427,13 @@ export default {
               },
               hidden: () => this.$isScopedPolicyMenuHidden('server_hidden_columns.vmem_size'),
             },
+            {
+              field: 'cpu_numa_pin',
+              title: this.$t('compute.text_609'),
+              formatter: ({ row }) => {
+                return formatCpuNumaPin(row)
+              },
+            },
             {
               field: 'sysDisk',
               title: this.$t('compute.text_49'),

containers/Compute/views/vminstance/utils.js

@@ -1,5 +1,10 @@
+import Vue from 'vue'
 import { typeClouds } from '@/utils/common/hypervisor'
 import i18n from '@/locales'
+import { sizestr } from '@/utils/utils'
+
+const __cpuNumaPinHVm = new Vue()
+const _cpuNumaPinH = (...args) => __cpuNumaPinHVm.$createElement(...args)
 
 const hypervisorMap = typeClouds.hypervisorMap
 
@@ -924,3 +929,75 @@ export const validateRescueMode = (val) => {
   }
   return ret
 }
+
+/** cpu_numa_pin：每项一行；内存 sizestr；绑定 CPU 取全部 pcpu 排序后合并连续区间 */
+export const formatSortedPcpuRanges = (sortedPcpus) => {
+  if (!sortedPcpus.length) return '-'
+  const parts = []
+  let start = sortedPcpus[0]
+  let end = sortedPcpus[0]
+  for (let i = 1; i < sortedPcpus.length; i++) {
+    const cur = sortedPcpus[i]
+    if (cur === end + 1) {
+      end = cur
+    } else {
+      parts.push(start === end ? String(start) : `${start}-${end}`)
+      start = cur
+      end = cur
+    }
+  }
+  parts.push(start === end ? String(start) : `${start}-${end}`)
+  return parts.join(',')
+}
+
+const getCpuNumaPinLineData = (item) => {
+  const nodeId = item.node_id
+  const sizeMb = item.size_mb
+  const pin = item.vcpu_pin || []
+  const pcpus = [...new Set(
+    pin
+      .filter(p => p && typeof p.pcpu === 'number')
+      .map(p => p.pcpu),
+  )].sort((a, b) => a - b)
+  const cpuStr = formatSortedPcpuRanges(pcpus)
+  const memStr = sizestr(sizeMb, 'M', 1024)
+  return { nodeId, memStr, cpuStr }
+}
+
+export const formatCpuNumaPinLine = (item) => {
+  const { nodeId, memStr, cpuStr } = getCpuNumaPinLineData(item)
+  return `node:${nodeId} mem: ${memStr} cpu: ${cpuStr}`
+}
+
+const CPU_NUMA_PIN_LINE_GAP = '12px'
+
+export const formatCpuNumaPin = (row) => {
+  const raw = row.cpu_numa_pin
+  if (raw === undefined || raw === null || raw === '') return '-'
+  let arr = raw
+  if (typeof raw === 'string') {
+    try {
+      arr = JSON.parse(raw)
+    } catch (e) {
+      return '-'
+    }
+  }
+  if (!Array.isArray(arr) || arr.length === 0) return '-'
+  return _cpuNumaPinH('div', arr.map((item, idx) => {
+    const { nodeId, memStr, cpuStr } = getCpuNumaPinLineData(item)
+    return _cpuNumaPinH('div', {
+      key: idx,
+      style: {
+        display: 'flex',
+        flexWrap: 'wrap',
+        alignItems: 'center',
+        columnGap: CPU_NUMA_PIN_LINE_GAP,
+        rowGap: '4px',
+      },
+    }, [
+      _cpuNumaPinH('span', `node: ${nodeId}`),
+      _cpuNumaPinH('span', `mem: ${memStr}`),
+      _cpuNumaPinH('span', `cpu: ${cpuStr}`),
+    ])
+  }))
+}