tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rrd: fix display interval, try to avoid numeric errors

Browse Source
This commit is contained in:
Dietmar Maurer 2020-05-23 16:03:43 +02:00
parent 803ab12ad4
commit 8c981ae379
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rrd/rrd.rs
View File

@ -2,7 +2,6 @@ use std::io::Read;
use std::path::Path; use std::path::Path;
use anyhow::{bail, Error}; use anyhow::{bail, Error};
use serde_json::{json, Value};
use crate::api2::types::{RRDMode, RRDTimeFrameResolution}; use crate::api2::types::{RRDMode, RRDTimeFrameResolution};
@ -49,7 +48,7 @@ impl RRD {
let reso = timeframe as u64; let reso = timeframe as u64;
let end = reso*((epoch + reso -1)/reso); let end = reso*(epoch/reso + 1);
let start = end - reso*(RRD_DATA_ENTRIES as u64); let start = end - reso*(RRD_DATA_ENTRIES as u64);
let rrd_end = reso*(self.last_update/reso); let rrd_end = reso*(self.last_update/reso);
@ -140,7 +139,10 @@ impl RRD {
RRDEntry { max: value, average: value, count: 1 } RRDEntry { max: value, average: value, count: 1 }
} else { } else {
let new_max = if max > value { max } else { value }; let new_max = if max > value { max } else { value };
let new_average = (average*(count as f64) + value)/(new_count as f64); //let new_average = (average*(count as f64) + value)/(new_count as f64);
// Note: Try to avoid numeric errors
let new_average = average*((count as f64)/(new_count as f64))
+ value/(new_count as f64);
RRDEntry { max: new_max, average: new_average, count: new_count } RRDEntry { max: new_max, average: new_average, count: new_count }
} }
} }