From: Dietmar Maurer Date: Wed, 4 Dec 2019 14:49:11 +0000 (+0100) Subject: src/backup/backup_info.rs: new compute_prune_list helper X-Git-Tag: v0.1.3~387 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=aeeac29bb1a6a7fd0f2dcacda2730b4b3c3a01c8;p=proxmox-backup.git src/backup/backup_info.rs: new compute_prune_list helper So that we can write regression tests for this. --- diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 878836e0..5d3e6465 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -1,7 +1,6 @@ use std::collections::{HashSet, HashMap}; -use std::path::PathBuf; -use chrono::{DateTime, Datelike, TimeZone, Local}; +use chrono::{TimeZone, Local}; use failure::*; use futures::*; use hyper::http::request::Parts; @@ -59,26 +58,6 @@ fn group_backups(backup_list: Vec) -> HashMap, &BackupInfo) -> String> ( - mark: &mut HashSet, - list: &Vec, - keep: usize, - select_id: F, -){ - let mut hash = HashSet::new(); - for info in list { - let local_time = info.backup_dir.backup_time().with_timezone(&Local); - if hash.len() >= keep as usize { break; } - let backup_id = info.backup_dir.relative_path(); - let sel_id: String = select_id(local_time, &info); - if !hash.contains(&sel_id) { - hash.insert(sel_id); - //println!(" KEEP ID {} {}", backup_id, local_time.format("%c")); - mark.insert(backup_id); - } - } -} - fn list_groups( param: Value, _info: &ApiMethod, @@ -300,7 +279,6 @@ const API_METHOD_STATUS: ApiMethod = ApiMethod::new( ) ); - fn prune( param: Value, _info: &ApiMethod, @@ -334,46 +312,16 @@ fn prune( worker.log(format!("Starting prune on store {}", store)); } - let mut list = group.list_backups(&datastore.base_path())?; - - let mut mark = HashSet::new(); - - BackupInfo::sort_list(&mut list, false); - - if let Some(keep_last) = param["keep-last"].as_u64() { - list.iter().take(keep_last as usize).for_each(|info| { - mark.insert(info.backup_dir.relative_path()); - }); - } - - if let Some(keep_daily) = param["keep-daily"].as_u64() { - mark_selections(&mut mark, &list, keep_daily as usize, |local_time, _info| { - format!("{}/{}/{}", local_time.year(), local_time.month(), local_time.day()) - }); - } - - if let Some(keep_weekly) = param["keep-weekly"].as_u64() { - mark_selections(&mut mark, &list, keep_weekly as usize, |local_time, _info| { - format!("{}/{}", local_time.year(), local_time.iso_week().week()) - }); - } - - if let Some(keep_monthly) = param["keep-monthly"].as_u64() { - mark_selections(&mut mark, &list, keep_monthly as usize, |local_time, _info| { - format!("{}/{}", local_time.year(), local_time.month()) - }); - } - - if let Some(keep_yearly) = param["keep-yearly"].as_u64() { - mark_selections(&mut mark, &list, keep_yearly as usize, |local_time, _info| { - format!("{}/{}", local_time.year(), local_time.year()) - }); - } - - let mut remove_list: Vec = list.into_iter() - .filter(|info| !mark.contains(&info.backup_dir.relative_path())).collect(); + let list = group.list_backups(&datastore.base_path())?; - BackupInfo::sort_list(&mut remove_list, true); + let remove_list = BackupGroup::compute_prune_list( + list, + param["keep-last"].as_u64(), + param["keep-daily"].as_u64(), + param["keep-weekly"].as_u64(), + param["keep-monthly"].as_u64(), + param["keep-yearly"].as_u64(), + )?; for info in remove_list { worker.log(format!("remove {:?}", info.backup_dir)); diff --git a/src/backup/backup_info.rs b/src/backup/backup_info.rs index c601c3ea..46cadb27 100644 --- a/src/backup/backup_info.rs +++ b/src/backup/backup_info.rs @@ -3,8 +3,9 @@ use crate::tools; use failure::*; use regex::Regex; use std::os::unix::io::RawFd; +use std::collections::HashSet; -use chrono::{DateTime, TimeZone, SecondsFormat, Utc}; +use chrono::{DateTime, Datelike, TimeZone, SecondsFormat, Utc, Local}; use std::path::{PathBuf, Path}; use lazy_static::lazy_static; @@ -99,6 +100,76 @@ impl BackupGroup { })?; Ok(list) } + + fn mark_selections, &BackupInfo) -> String> ( + mark: &mut HashSet, + list: &Vec, + keep: usize, + select_id: F, + ){ + let mut hash = HashSet::new(); + for info in list { + let local_time = info.backup_dir.backup_time().with_timezone(&Local); + if hash.len() >= keep as usize { break; } + let backup_id = info.backup_dir.relative_path(); + let sel_id: String = select_id(local_time, &info); + if !hash.contains(&sel_id) { + hash.insert(sel_id); + mark.insert(backup_id); + } + } + } + + pub fn compute_prune_list( + mut list: Vec, + keep_last: Option, + keep_daily: Option, + keep_weekly: Option, + keep_monthly: Option, + keep_yearly: Option, + ) -> Result, Error> { + + let mut mark = HashSet::new(); + + BackupInfo::sort_list(&mut list, false); + + if let Some(keep_last) = keep_last { + list.iter().take(keep_last as usize).for_each(|info| { + mark.insert(info.backup_dir.relative_path()); + }); + } + + if let Some(keep_daily) = keep_daily { + Self::mark_selections(&mut mark, &list, keep_daily as usize, |local_time, _info| { + format!("{}/{}/{}", local_time.year(), local_time.month(), local_time.day()) + }); + } + + if let Some(keep_weekly) = keep_weekly { + Self::mark_selections(&mut mark, &list, keep_weekly as usize, |local_time, _info| { + format!("{}/{}", local_time.year(), local_time.iso_week().week()) + }); + } + + if let Some(keep_monthly) = keep_monthly { + Self::mark_selections(&mut mark, &list, keep_monthly as usize, |local_time, _info| { + format!("{}/{}", local_time.year(), local_time.month()) + }); + } + + if let Some(keep_yearly) = keep_yearly { + Self::mark_selections(&mut mark, &list, keep_yearly as usize, |local_time, _info| { + format!("{}/{}", local_time.year(), local_time.year()) + }); + } + + let mut remove_list: Vec = list.into_iter() + .filter(|info| !mark.contains(&info.backup_dir.relative_path())).collect(); + + BackupInfo::sort_list(&mut remove_list, true); + + Ok(remove_list) + } } /// Uniquely identify a Backup (relative to data store)