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 EB6EF6968D for ; Tue, 2 Mar 2021 14:38:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E2BB42D053 for ; Tue, 2 Mar 2021 14:38:50 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 715C52D04A for ; Tue, 2 Mar 2021 14:38:50 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 372DD4581E for ; Tue, 2 Mar 2021 14:38:50 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 2 Mar 2021 14:38:49 +0100 Message-Id: <20210302133849.19892-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.201 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [status.rs] Subject: [pbs-devel] [PATCH proxmox-backup] dashboard: fix datastore full estimate for not changing usage X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2021 13:38:51 -0000 If the usage of a datastore did not change, we did not return an estimate. The ui interpreted this as 'not enough data', but it should actually be 'never'. Fixing this by always setting the estimate first to 0 and overwriting if we successfully calculated one, and checking for 'undefined' in the ui. Signed-off-by: Dominik Csapak --- src/api2/status.rs | 3 +-- www/Utils.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/api2/status.rs b/src/api2/status.rs index 5ea1525d..11b46154 100644 --- a/src/api2/status.rs +++ b/src/api2/status.rs @@ -160,12 +160,11 @@ pub fn datastore_status( // we skip the calculation for datastores with not enough data if usage_list.len() >= 7 { + entry["estimated-full-date"] = Value::from(0); if let Some((a,b)) = linear_regression(&time_list, &usage_list) { if b != 0.0 { let estimate = (1.0 - a) / b; entry["estimated-full-date"] = Value::from(estimate.floor() as u64); - } else { - entry["estimated-full-date"] = Value::from(0); } } } diff --git a/www/Utils.js b/www/Utils.js index 778dad24..4667efb2 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -277,7 +277,7 @@ Ext.define('PBS.Utils', { }, render_estimate: function(value) { - if (!value) { + if (value === undefined) { return gettext('Not enough data'); } -- 2.20.1