From 855b55dc14de3ad2af0307e3b1d8cb0ec978f9d2 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Thu, 22 Jul 2021 15:41:06 +0200 Subject: [PATCH] api2: tape: media: use MediaCatalog::snapshot_list for content listing this should make the api call much faster, since it is not reading the whole catalog anymore Signed-off-by: Dominik Csapak Signed-off-by: Dietmar Maurer --- src/api2/tape/media.rs | 45 ++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/src/api2/tape/media.rs b/src/api2/tape/media.rs index 8351b2be..f8e1699d 100644 --- a/src/api2/tape/media.rs +++ b/src/api2/tape/media.rs @@ -42,6 +42,7 @@ use crate::{ Inventory, MediaPool, MediaCatalog, + media_catalog_snapshot_list, changer::update_online_status, }, }; @@ -502,32 +503,28 @@ pub fn list_content( .generate_media_set_name(&set.uuid, template) .unwrap_or_else(|_| set.uuid.to_string()); - let catalog = MediaCatalog::open(status_path, &media_id, false, false)?; + for (store, snapshot) in media_catalog_snapshot_list(status_path, &media_id)? { + let backup_dir: BackupDir = snapshot.parse()?; - for (store, content) in catalog.content() { - for snapshot in content.snapshot_index.keys() { - let backup_dir: BackupDir = snapshot.parse()?; - - if let Some(ref backup_type) = filter.backup_type { - if backup_dir.group().backup_type() != backup_type { continue; } - } - if let Some(ref backup_id) = filter.backup_id { - if backup_dir.group().backup_id() != backup_id { continue; } - } - - list.push(MediaContentEntry { - uuid: media_id.label.uuid.clone(), - label_text: media_id.label.label_text.to_string(), - pool: set.pool.clone(), - media_set_name: media_set_name.clone(), - media_set_uuid: set.uuid.clone(), - media_set_ctime: set.ctime, - seq_nr: set.seq_nr, - snapshot: snapshot.to_owned(), - store: store.to_owned(), - backup_time: backup_dir.backup_time(), - }); + if let Some(ref backup_type) = filter.backup_type { + if backup_dir.group().backup_type() != backup_type { continue; } } + if let Some(ref backup_id) = filter.backup_id { + if backup_dir.group().backup_id() != backup_id { continue; } + } + + list.push(MediaContentEntry { + uuid: media_id.label.uuid.clone(), + label_text: media_id.label.label_text.to_string(), + pool: set.pool.clone(), + media_set_name: media_set_name.clone(), + media_set_uuid: set.uuid.clone(), + media_set_ctime: set.ctime, + seq_nr: set.seq_nr, + snapshot: snapshot.to_owned(), + store: store.to_owned(), + backup_time: backup_dir.backup_time(), + }); } }