From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B0C7D73BE4 for ; Wed, 7 Jul 2021 14:49:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9B2898BAD for ; Wed, 7 Jul 2021 14:49:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id BF48B8BA3 for ; Wed, 7 Jul 2021 14:49:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 794E640ED7 for ; Wed, 7 Jul 2021 14:49:20 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 7 Jul 2021 14:49:19 +0200 Message-Id: <20210707124919.707219-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.666 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 v2] ui: ceph/Status: fix recovery percentage display 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: , X-List-Received-Date: Wed, 07 Jul 2021 12:49:21 -0000 we incorrectly used 'total' as 100% of the to recovered objects here, but that containst the total number of *bytes*. rename 'toRecover' to better reflect that the unit is 'objects' and use that as total reported by a user: https://forum.proxmox.com/threads/bug-ceph-recovery-bar-not-showing-percentage.91782/ Signed-off-by: Dominik Csapak --- would be good to backport to stable-6 www/manager6/ceph/Status.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/manager6/ceph/Status.js b/www/manager6/ceph/Status.js index e92c698b..bdcf3f1b 100644 --- a/www/manager6/ceph/Status.js +++ b/www/manager6/ceph/Status.js @@ -321,14 +321,14 @@ Ext.define('PVE.node.CephStatus', { let unhealthy = degraded + unfound + misplaced; // update recovery if (pgmap.recovering_objects_per_sec !== undefined || unhealthy > 0) { - let toRecover = pgmap.misplaced_total || pgmap.unfound_total || pgmap.degraded_total || 0; - if (toRecover === 0) { + let toRecoverObjects = pgmap.misplaced_total || pgmap.unfound_total || pgmap.degraded_total || 0; + if (toRecoverObjects === 0) { return; // FIXME: unexpected return and leaves things possible visible when it shouldn't? } - let recovered = toRecover - unhealthy || 0; + let recovered = toRecoverObjects - unhealthy || 0; let speed = pgmap.recovering_bytes_per_sec || 0; - let recoveryRatio = recovered / total; + let recoveryRatio = recovered / toRecoverObjects; let txt = `${(recoveryRatio * 100).toFixed(2)}%`; if (speed > 0) { let obj_per_sec = speed / (4 * 1024 * 1024); // 4 MiB per Object -- 2.30.2