From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [RFC PATCH proxmox-backup 4/7] api2/tape/restore: make datastore in restore_snapshot_archive optional
Date: Mon, 3 May 2021 10:38:03 +0200 [thread overview]
Message-ID: <20210503083806.24138-5-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210503083806.24138-1-d.csapak@proxmox.com>
and add the chunks to the hashset without going through the datastore
we'll want this to get a list of chunks from the indexes
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/tape/restore.rs | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs
index 1cde7c63..aa51ce4b 100644
--- a/src/api2/tape/restore.rs
+++ b/src/api2/tape/restore.rs
@@ -536,7 +536,7 @@ fn restore_archive<'a>(
if is_new {
task_log!(worker, "restore snapshot {}", backup_dir);
- match restore_snapshot_archive(worker, reader, &path, &datastore, checked_chunks) {
+ match restore_snapshot_archive(worker, reader, &path, Some(&datastore), checked_chunks) {
Err(err) => {
std::fs::remove_dir_all(&path)?;
bail!("restore snapshot {} failed - {}", backup_dir, err);
@@ -693,8 +693,8 @@ fn restore_snapshot_archive<'a>(
worker: &WorkerTask,
reader: Box<dyn 'a + TapeRead>,
snapshot_path: &Path,
- datastore: &DataStore,
- checked_chunks: &mut HashSet<[u8;32]>,
+ datastore: Option<&DataStore>,
+ checked_chunks: &mut HashSet<[u8; 32]>,
) -> Result<bool, Error> {
let mut decoder = pxar::decoder::sync::Decoder::from_std(reader)?;
@@ -723,8 +723,8 @@ fn try_restore_snapshot_archive<R: pxar::decoder::SeqRead>(
worker: &WorkerTask,
decoder: &mut pxar::decoder::sync::Decoder<R>,
snapshot_path: &Path,
- datastore: &DataStore,
- checked_chunks: &mut HashSet<[u8;32]>,
+ datastore: Option<&DataStore>,
+ checked_chunks: &mut HashSet<[u8; 32]>,
) -> Result<(), Error> {
let _root = match decoder.next() {
@@ -815,13 +815,29 @@ fn try_restore_snapshot_archive<R: pxar::decoder::SeqRead>(
let index = DynamicIndexReader::open(&archive_path)?;
let (csum, size) = index.compute_csum();
manifest.verify_file(&item.filename, &csum, size)?;
- datastore.fast_index_verification(&index, checked_chunks)?;
+ if let Some(ref datastore) = datastore {
+ datastore.fast_index_verification(&index, checked_chunks)?;
+ } else {
+ for i in 0..index.index_count() {
+ if let Some(digest) = index.index_digest(i) {
+ checked_chunks.insert(*digest);
+ }
+ }
+ }
}
ArchiveType::FixedIndex => {
let index = FixedIndexReader::open(&archive_path)?;
let (csum, size) = index.compute_csum();
manifest.verify_file(&item.filename, &csum, size)?;
- datastore.fast_index_verification(&index, checked_chunks)?;
+ if let Some(ref datastore) = datastore {
+ datastore.fast_index_verification(&index, checked_chunks)?;
+ } else {
+ for i in 0..index.index_count() {
+ if let Some(digest) = index.index_digest(i) {
+ checked_chunks.insert(*digest);
+ }
+ }
+ }
}
ArchiveType::Blob => {
let mut tmpfile = std::fs::File::open(&archive_path)?;
--
2.20.1
next prev parent reply other threads:[~2021-05-03 8:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 8:37 [pbs-devel] [RFC PATCH proxmox-backup] tape: single snapshot restore Dominik Csapak
2021-05-03 8:38 ` [pbs-devel] [RFC PATCH proxmox-backup 1/7] tape/drive: add 'move_to_file' to TapeDriver trait Dominik Csapak
2021-05-03 8:38 ` [pbs-devel] [RFC PATCH proxmox-backup 2/7] tape/media_catalog: add helpers to look for snapshot/chunk files Dominik Csapak
2021-05-03 8:38 ` [pbs-devel] [RFC PATCH proxmox-backup 3/7] api2/tape/restore: factor out check_datastore_privs Dominik Csapak
2021-05-03 8:38 ` Dominik Csapak [this message]
2021-05-03 8:38 ` [pbs-devel] [RFC PATCH proxmox-backup 5/7] api2/tape/restore: add 'restore-single' api path Dominik Csapak
2021-05-03 8:38 ` [pbs-devel] [RFC PATCH proxmox-backup 6/7] bin/proxmox-tape: add restore-single command to proxmox-tape Dominik Csapak
2021-05-03 8:38 ` [pbs-devel] [RFC PATCH proxmox-backup 7/7] ui: tape: add single snapshot restore Dominik Csapak
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=20210503083806.24138-5-d.csapak@proxmox.com \
--to=d.csapak@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