From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 29A3F1FF16B for ; Tue, 15 Jul 2025 16:38:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A8B949164; Tue, 15 Jul 2025 16:38:53 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Tue, 15 Jul 2025 16:32:11 +0200 Message-Id: <20250715143218.1548306-28-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250715143218.1548306-1-a.lauterer@proxmox.com> References: <20250715143218.1548306-1-a.lauterer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.018 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_MSPIKE_H2 0.001 Average reputation (+2) 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 v3 14/14] 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" First by using the new memhost field if guest is of type qemu and the field is numerical. Second by checking in the render function against the 'value' that has been calculated if we have percentages or bytes. Previously we always checked the raw record mem data. 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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 29334111..ed41714a 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1166,6 +1166,9 @@ Ext.define('PVE.Utils', { return -1; } + if (data.type === 'qemu' && Ext.isNumeric(data.memhost)) { + return data.memhost / maxmem; + } return data.mem / maxmem; }, @@ -1206,9 +1209,12 @@ Ext.define('PVE.Utils', { var node = PVE.data.ResourceStore.getAt(index); var maxmem = node.data.maxmem || 0; - if (record.data.mem > 1) { + if (value > 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 ''; } -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel