proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-07-05 08:49:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rrd_cache: use new callback for RRD creation

Browse Source 
Some changes in `promox-rrd` now require a separate callback for
creating a new RRD.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
This commit is contained in:
Lukas Wagner 2024-08-06 14:59:55 +02:00 committed by Wolfgang Bumiller
parent f629a56c47
commit 4fa99a164d
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/rrd_cache.rs
View File

@ -9,7 +9,7 @@ use std::path::Path;
use anyhow::{format_err, Error}; use anyhow::{format_err, Error};
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use proxmox_rrd::rrd::{AggregationFn, DataSourceType, Database}; use proxmox_rrd::rrd::{AggregationFn, DataSourceType, Database, Archive};
use proxmox_rrd::Cache; use proxmox_rrd::Cache;
use proxmox_sys::fs::CreateOptions; use proxmox_sys::fs::CreateOptions;
@ -49,6 +49,7 @@ pub fn initialize_rrd_cache() -> Result<&'static Cache, Error> {
Some(dir_options), Some(dir_options),
apply_interval, apply_interval,
load_callback, load_callback,
create_callback,
)?; )?;
RRD_CACHE RRD_CACHE
@ -58,22 +59,37 @@ pub fn initialize_rrd_cache() -> Result<&'static Cache, Error> {
Ok(RRD_CACHE.get().unwrap()) Ok(RRD_CACHE.get().unwrap())
} }
fn load_callback(path: &Path, _rel_path: &str, dst: DataSourceType) -> Database { fn load_callback(path: &Path, _rel_path: &str) -> Option<Database> {
match Database::load(path, true) { match Database::load(path, true) {
Ok(rrd) => rrd, Ok(rrd) => Some(rrd),
Err(err) => { Err(err) => {
if err.kind() != std::io::ErrorKind::NotFound { if err.kind() != std::io::ErrorKind::NotFound {
log::warn!( log::warn!("overwriting RRD file {path:?}, because of load error: {err}",);
"overwriting RRD file {:?}, because of load error: {}",
path,
err
);
} }
Cache::create_proxmox_backup_default_rrd(dst) None
} }
} }
} }
fn create_callback(dst: DataSourceType) -> Database {
let rra_list = vec![
// 1 min * 1440 => 1 day
Archive::new(AggregationFn::Average, 60, 1440),
Archive::new(AggregationFn::Maximum, 60, 1440),
// 30 min * 1440 => 30 days ~ 1 month
Archive::new(AggregationFn::Average, 30 * 60, 1440),
Archive::new(AggregationFn::Maximum, 30 * 60, 1440),
// 6 h * 1440 => 360 days ~ 1 year
Archive::new(AggregationFn::Average, 6 * 3600, 1440),
Archive::new(AggregationFn::Maximum, 6 * 3600, 1440),
// 1 week * 570 => 10 years
Archive::new(AggregationFn::Average, 7 * 86400, 570),
Archive::new(AggregationFn::Maximum, 7 * 86400, 570),
];
Database::new(dst, rra_list)
}
/// Extracts data for the specified time frame from from RRD cache /// Extracts data for the specified time frame from from RRD cache
pub fn extract_rrd_data( pub fn extract_rrd_data(
basedir: &str, basedir: &str,