From: Dietmar Maurer <dietmar@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v3 4/4] api2: tape: media: use MediaCatalog::snapshot_list for content listing
Date: Wed, 28 Jul 2021 11:11:18 +0200 [thread overview]
Message-ID: <20210728091118.581161-5-dietmar@proxmox.com> (raw)
In-Reply-To: <20210728091118.581161-1-dietmar@proxmox.com>
From: Dominik Csapak <d.csapak@proxmox.com>
this should make the api call much faster, since it is not reading
the whole catalog anymore
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
---
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(),
+ });
}
}
--
2.30.2
next prev parent reply other threads:[~2021-07-28 9:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-28 9:11 [pbs-devel] [PATCH proxmox-backup v3 0/4] improve catalog handling Dietmar Maurer
2021-07-28 9:11 ` [pbs-devel] [PATCH proxmox-backup v3 1/4] cleanup: factor out tape catalog path helpers Dietmar Maurer
2021-07-28 9:11 ` [pbs-devel] [PATCH proxmox-backup v3 2/4] tape: lock media_catalog file to to get a consistent view with load_catalog Dietmar Maurer
2021-07-28 9:11 ` [pbs-devel] [PATCH proxmox-backup v3 3/4] tape: media_catalog: add snapshot list cache for catalog Dietmar Maurer
2021-07-28 9:11 ` Dietmar Maurer [this message]
2021-07-29 12:30 ` [pbs-devel] applied: [PATCH proxmox-backup v3 0/4] improve catalog handling Dietmar Maurer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210728091118.581161-5-dietmar@proxmox.com \
--to=dietmar@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox