public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pbs-devel] [PATCH proxmox-backup] dashboard: fix datastore full estimate for not changing usage
@ 2021-03-02 13:38 Dominik Csapak
  2021-03-02 16:51 ` [pbs-devel] applied: " Dietmar Maurer
  0 siblings, 1 reply; 2+ messages in thread
From: Dominik Csapak @ 2021-03-02 13:38 UTC (permalink / raw)
  To: pbs-devel

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 <d.csapak@proxmox.com>
---
 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





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-03-02 16:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-02 13:38 [pbs-devel] [PATCH proxmox-backup] dashboard: fix datastore full estimate for not changing usage Dominik Csapak
2021-03-02 16:51 ` [pbs-devel] applied: " Dietmar Maurer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal