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

src/backup/backup_info.rs - prune: improve algorythm

Browse Source
This commit is contained in:
Dietmar Maurer 2019-12-05 18:41:28 +01:00
parent 659da6c957
commit 6f47dd8a0f
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/backup/backup_info.rs
View File

@ -110,17 +110,29 @@ impl BackupGroup {
select_id: F, select_id: F,
) { ) {
let mut hash = HashSet::new(); let mut include_hash = HashSet::new();
let mut already_included = HashSet::new();
for info in list { for info in list {
let backup_id = info.backup_dir.relative_path(); let backup_id = info.backup_dir.relative_path();
if let Some(_) = mark.get(&backup_id) { if let Some(PruneMark::Keep) = mark.get(&backup_id) {
continue; let local_time = info.backup_dir.backup_time().with_timezone(&Local);
let sel_id: String = select_id(local_time, &info);
already_included.insert(sel_id);
} }
}
for info in list {
let backup_id = info.backup_dir.relative_path();
if let Some(_) = mark.get(&backup_id) { continue; }
let local_time = info.backup_dir.backup_time().with_timezone(&Local); let local_time = info.backup_dir.backup_time().with_timezone(&Local);
let sel_id: String = select_id(local_time, &info); let sel_id: String = select_id(local_time, &info);
if !hash.contains(&sel_id) {
if hash.len() >= keep { break; } if already_included.contains(&sel_id) { continue; }
hash.insert(sel_id);
if !include_hash.contains(&sel_id) {
if include_hash.len() >= keep { break; }
include_hash.insert(sel_id);
mark.insert(backup_id, PruneMark::Keep); mark.insert(backup_id, PruneMark::Keep);
} else { } else {
mark.insert(backup_id, PruneMark::Remove); mark.insert(backup_id, PruneMark::Remove);

1
tests/prune.rs
View File

@ -134,6 +134,7 @@ fn test_prune_simple() -> Result<(), Error> {
let remove_list = get_prune_list(list, None, Some(1), Some(5), None, None); let remove_list = get_prune_list(list, None, Some(1), Some(5), None, None);
let expect: Vec<PathBuf> = vec![ let expect: Vec<PathBuf> = vec![
PathBuf::from("host/elsa/2019-12-02T11:59:15Z"), PathBuf::from("host/elsa/2019-12-02T11:59:15Z"),
PathBuf::from("host/elsa/2019-12-03T11:59:15Z"),
PathBuf::from("host/elsa/2019-12-04T11:59:15Z"), PathBuf::from("host/elsa/2019-12-04T11:59:15Z"),
]; ];
assert_eq!(remove_list, expect); assert_eq!(remove_list, expect);