From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id A71DA1FF15F for ; Sat, 26 Jul 2025 03:10:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 714B532308; Sat, 26 Jul 2025 03:11:59 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Sat, 26 Jul 2025 03:06:16 +0200 Message-Id: <20250726010626.1496866-22-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250726010626.1496866-1-a.lauterer@proxmox.com> References: <20250726010626.1496866-1-a.lauterer@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753491982282 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.016 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager v4 12/15] fix #6068: ui: utils: calculate and render host memory usage correctly X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" by adding the new memhost field, which is populated for VMs, and using it if the guest is of type qemu and the field is numerical. As a result, if the cluster is in a mixed PVE8 / PVE9 situation, for example during a migration, we will not report any host memory usage, in numbers or percent, as we don't get the memhost metric from the older PVE8 hosts. Fixes: #6068 (Node Search tab incorrect Host memory usage %) Signed-off-by: Aaron Lauterer --- www/manager6/Utils.js | 6 ++++++ www/manager6/data/ResourceStore.js | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index e403db40..57a818f6 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1160,6 +1160,9 @@ Ext.define('PVE.Utils', { return -1; } + if (data.type === 'qemu' && Ext.isNumeric(data.memhost)) { + return data.memhost / maxmem; + } return data.mem / maxmem; }, @@ -1203,6 +1206,9 @@ Ext.define('PVE.Utils', { if (record.data.mem > 1) { // we got no percentage but bytes let mem = record.data.mem; + if (record.data.type === 'qemu' && Ext.isNumeric(record.data.memhost)) { + mem = record.data.memhost; + } if (!record.data.uptime || maxmem === 0 || !Ext.isNumeric(mem)) { return ''; } diff --git a/www/manager6/data/ResourceStore.js b/www/manager6/data/ResourceStore.js index 13af3b4e..d1f3fb63 100644 --- a/www/manager6/data/ResourceStore.js +++ b/www/manager6/data/ResourceStore.js @@ -167,6 +167,14 @@ Ext.define('PVE.data.ResourceStore', { hidden: true, width: 100, }, + memhost: { + header: gettext('Host Memory usage'), + type: 'integer', + renderer: PVE.Utils.render_mem_usage, + sortable: true, + hidden: true, + width: 100, + }, memuse: { header: gettext('Memory usage') + ' %', type: 'number', -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel