From: Dietmar Maurer <dietmar@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
Subject: [pbs-devel] applied: [PATCH proxmox-backup v2 4/8] api2/tape/restore: remove unnecessary params from (try_)restore_snapshot_archive
Date: Thu, 6 May 2021 08:02:33 +0200 [thread overview]
Message-ID: <826bc75c-3040-254c-c1c4-b6336cb85147@proxmox.com> (raw)
In-Reply-To: <20210505100918.506-5-d.csapak@proxmox.com>
applied
On 5/5/21 12:09 PM, Dominik Csapak wrote:
> we do not need them
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> src/api2/tape/restore.rs | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs
> index b7bf6670..f3452364 100644
> --- a/src/api2/tape/restore.rs
> +++ b/src/api2/tape/restore.rs
> @@ -503,8 +503,6 @@ fn restore_archive<'a>(
> let datastore_name = archive_header.store;
> let snapshot = archive_header.snapshot;
>
> - let checked_chunks = checked_chunks_map.entry(datastore_name.clone()).or_insert(HashSet::new());
> -
> task_log!(worker, "File {}: snapshot archive {}:{}", current_file_number, datastore_name, snapshot);
>
> let backup_dir: BackupDir = snapshot.parse()?;
> @@ -531,7 +529,7 @@ fn restore_archive<'a>(
> if is_new {
> task_log!(worker, "restore snapshot {}", backup_dir);
>
> - match restore_snapshot_archive(worker.clone(), reader, &path, &datastore, checked_chunks) {
> + match restore_snapshot_archive(worker.clone(), reader, &path) {
> Err(err) => {
> std::fs::remove_dir_all(&path)?;
> bail!("restore snapshot {} failed - {}", backup_dir, err);
> @@ -774,13 +772,11 @@ fn restore_snapshot_archive<'a>(
> worker: Arc<WorkerTask>,
> reader: Box<dyn 'a + TapeRead>,
> snapshot_path: &Path,
> - datastore: &DataStore,
> - checked_chunks: &mut HashSet<[u8;32]>,
> ) -> Result<bool, Error> {
>
> let mut decoder = pxar::decoder::sync::Decoder::from_std(reader)?;
> - match try_restore_snapshot_archive(worker, &mut decoder, snapshot_path, datastore, checked_chunks) {
> - Ok(()) => Ok(true),
> + match try_restore_snapshot_archive(worker, &mut decoder, snapshot_path) {
> + Ok(_) => Ok(true),
> Err(err) => {
> let reader = decoder.input();
>
> @@ -804,8 +800,6 @@ fn try_restore_snapshot_archive<R: pxar::decoder::SeqRead>(
> worker: Arc<WorkerTask>,
> decoder: &mut pxar::decoder::sync::Decoder<R>,
> snapshot_path: &Path,
> - _datastore: &DataStore,
> - _checked_chunks: &mut HashSet<[u8;32]>,
> ) -> Result<(), Error> {
>
> let _root = match decoder.next() {
next prev parent reply other threads:[~2021-05-06 6:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 10:09 [pbs-devel] [PATCH proxmox-backup v2 0/8] tape: single snapshot restore Dominik Csapak
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 1/8] tape/drive: add 'move_to_file' to TapeDriver trait Dominik Csapak
2021-05-06 5:56 ` [pbs-devel] applied: " Dietmar Maurer
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 2/8] tape/media_catalog: add helpers to look for snapshot/chunk files Dominik Csapak
2021-05-06 5:59 ` [pbs-devel] applied: " Dietmar Maurer
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 3/8] api2/tape/restore: factor out check_datastore_privs Dominik Csapak
2021-05-06 6:01 ` [pbs-devel] applied: " Dietmar Maurer
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 4/8] api2/tape/restore: remove unnecessary params from (try_)restore_snapshot_archive Dominik Csapak
2021-05-06 6:02 ` Dietmar Maurer [this message]
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 5/8] api2/tape/restore: return backup manifest in try_restore_snapshot_archive Dominik Csapak
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 6/8] api2/tape/restore: add 'restore-single' api path Dominik Csapak
2021-05-05 10:53 ` Thomas Lamprecht
2021-05-05 12:48 ` Dominik Csapak
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 7/8] bin/proxmox-tape: add restore-single command to proxmox-tape Dominik Csapak
2021-05-05 11:04 ` Thomas Lamprecht
2021-05-05 12:50 ` Dominik Csapak
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 8/8] 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=826bc75c-3040-254c-c1c4-b6336cb85147@proxmox.com \
--to=dietmar@proxmox.com \
--cc=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