]> git.proxmox.com Git - pve-manager.git/commitdiff
ui: ceph/Status: fix recovery percentage display
authorDominik Csapak <d.csapak@proxmox.com>
Wed, 7 Jul 2021 12:49:19 +0000 (14:49 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Wed, 7 Jul 2021 16:08:34 +0000 (18:08 +0200)
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 <d.csapak@proxmox.com>
www/manager6/ceph/Status.js

index e92c698b7008ebeecbaeaeff18f3b9bd98208e55..bdcf3f1bb7ba90e5f45a4a67cab21f6181e025f1 100644 (file)
@@ -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