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

cleanup: simplify next_expired_media()

Browse Source
This commit is contained in:
Dietmar Maurer 2021-08-04 11:01:18 +02:00
parent 023adb5945
commit bb14ed8cab
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tape/media_pool.rs
View File

@ -468,21 +468,13 @@ impl MediaPool {
// Get next expired media // Get next expired media
pub fn next_expired_media(&self, current_time: i64, media_list: &[BackupMedia]) -> Option<MediaId> { pub fn next_expired_media(&self, current_time: i64, media_list: &[BackupMedia]) -> Option<MediaId> {
let mut used_media = Vec::new(); let mut expired_media = Vec::new();
for media in media_list.into_iter() { for media in media_list.into_iter() {
if !self.location_is_available(media.location()) { if !self.location_is_available(media.location()) {
continue; continue;
} }
// already part of a media set? // already part of a media set?
if media.media_set_label().is_some() {
used_media.push(media);
}
}
let mut expired_media = Vec::new();
for media in used_media.into_iter() {
if let Some(set) = media.media_set_label() { if let Some(set) = media.media_set_label() {
if &set.uuid == self.current_media_set.uuid() { if &set.uuid == self.current_media_set.uuid() {
continue; continue;