diff --git a/proxmox-rrd/examples/prrd.rs b/proxmox-rrd/examples/prrd.rs index 59e75d3c9..e00e5a0e2 100644 --- a/proxmox-rrd/examples/prrd.rs +++ b/proxmox-rrd/examples/prrd.rs @@ -51,7 +51,7 @@ pub struct RRAConfig { /// Dump the RRD file in JSON format pub fn dump_rrd(path: String) -> Result<(), Error> { - let rrd = RRD::load(&PathBuf::from(path))?; + let rrd = RRD::load(&PathBuf::from(path), false)?; serde_json::to_writer_pretty(std::io::stdout(), &rrd)?; println!(""); Ok(()) @@ -69,7 +69,7 @@ pub fn dump_rrd(path: String) -> Result<(), Error> { /// RRD file information pub fn rrd_info(path: String) -> Result<(), Error> { - let rrd = RRD::load(&PathBuf::from(path))?; + let rrd = RRD::load(&PathBuf::from(path), false)?; println!("DST: {:?}", rrd.source.dst); @@ -109,10 +109,10 @@ pub fn update_rrd( let time = time.map(|v| v as f64) .unwrap_or_else(proxmox_time::epoch_f64); - let mut rrd = RRD::load(&path)?; + let mut rrd = RRD::load(&path, false)?; rrd.update(time, value); - rrd.save(&path, CreateOptions::new())?; + rrd.save(&path, CreateOptions::new(), false)?; Ok(()) } @@ -149,7 +149,7 @@ pub fn fetch_rrd( end: Option, ) -> Result<(), Error> { - let rrd = RRD::load(&PathBuf::from(path))?; + let rrd = RRD::load(&PathBuf::from(path), false)?; let data = rrd.extract_data(cf, resolution, start, end)?; @@ -177,7 +177,7 @@ pub fn first_update_time( rra_index: usize, ) -> Result<(), Error> { - let rrd = RRD::load(&PathBuf::from(path))?; + let rrd = RRD::load(&PathBuf::from(path), false)?; if rra_index >= rrd.rra_list.len() { bail!("rra-index is out of range"); @@ -202,7 +202,7 @@ pub fn first_update_time( /// Return the Unix timestamp of the last update pub fn last_update_time(path: String) -> Result<(), Error> { - let rrd = RRD::load(&PathBuf::from(path))?; + let rrd = RRD::load(&PathBuf::from(path), false)?; println!("{}", rrd.source.last_update); Ok(()) @@ -220,7 +220,7 @@ pub fn last_update_time(path: String) -> Result<(), Error> { /// Return the time and value from the last update pub fn last_update(path: String) -> Result<(), Error> { - let rrd = RRD::load(&PathBuf::from(path))?; + let rrd = RRD::load(&PathBuf::from(path), false)?; let result = json!({ "time": rrd.source.last_update, @@ -272,7 +272,7 @@ pub fn create_rrd( let rrd = RRD::new(dst, rra_list); - rrd.save(&path, CreateOptions::new())?; + rrd.save(&path, CreateOptions::new(), false)?; Ok(()) } @@ -302,7 +302,7 @@ pub fn resize_rrd( let path = PathBuf::from(&path); - let mut rrd = RRD::load(&path)?; + let mut rrd = RRD::load(&path, false)?; if rra_index >= rrd.rra_list.len() { bail!("rra-index is out of range"); @@ -331,7 +331,7 @@ pub fn resize_rrd( rrd.rra_list[rra_index] = new_rra; - rrd.save(&path, CreateOptions::new())?; + rrd.save(&path, CreateOptions::new(), false)?; Ok(()) } diff --git a/proxmox-rrd/tests/file_format_test.rs b/proxmox-rrd/tests/file_format_test.rs index cecb242d7..b0e0e894f 100644 --- a/proxmox-rrd/tests/file_format_test.rs +++ b/proxmox-rrd/tests/file_format_test.rs @@ -28,11 +28,11 @@ const RRD_V2_FN: &str = "./tests/testdata/cpu.rrd_v2"; #[test] fn upgrade_from_rrd_v1() -> Result<(), Error> { - let rrd = RRD::load(Path::new(RRD_V1_FN))?; + let rrd = RRD::load(Path::new(RRD_V1_FN), true)?; const RRD_V2_NEW_FN: &str = "./tests/testdata/cpu.rrd_v2.upgraded"; let new_path = Path::new(RRD_V2_NEW_FN); - rrd.save(new_path, CreateOptions::new())?; + rrd.save(new_path, CreateOptions::new(), true)?; let result = compare_file(RRD_V2_FN, RRD_V2_NEW_FN); let _ = std::fs::remove_file(RRD_V2_NEW_FN); @@ -45,11 +45,11 @@ fn upgrade_from_rrd_v1() -> Result<(), Error> { #[test] fn load_and_save_rrd_v2() -> Result<(), Error> { - let rrd = RRD::load(Path::new(RRD_V2_FN))?; + let rrd = RRD::load(Path::new(RRD_V2_FN), true)?; const RRD_V2_NEW_FN: &str = "./tests/testdata/cpu.rrd_v2.saved"; let new_path = Path::new(RRD_V2_NEW_FN); - rrd.save(new_path, CreateOptions::new())?; + rrd.save(new_path, CreateOptions::new(), true)?; let result = compare_file(RRD_V2_FN, RRD_V2_NEW_FN); let _ = std::fs::remove_file(RRD_V2_NEW_FN);