From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7767F79A66 for ; Wed, 5 May 2021 12:09:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 73124139DC for ; Wed, 5 May 2021 12:09:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id A7BBA13967 for ; Wed, 5 May 2021 12:09:19 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7EBC642AB8 for ; Wed, 5 May 2021 12:09:19 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 5 May 2021 12:09:14 +0200 Message-Id: <20210505100918.506-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210505100918.506-1-d.csapak@proxmox.com> References: <20210505100918.506-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.017 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [restore.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 4/8] api2/tape/restore: remove unnecessary params from (try_)restore_snapshot_archive X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2021 10:09:21 -0000 we do not need them Signed-off-by: Dominik Csapak --- 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, reader: Box, snapshot_path: &Path, - datastore: &DataStore, - checked_chunks: &mut HashSet<[u8;32]>, ) -> Result { 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( worker: Arc, decoder: &mut pxar::decoder::sync::Decoder, snapshot_path: &Path, - _datastore: &DataStore, - _checked_chunks: &mut HashSet<[u8;32]>, ) -> Result<(), Error> { let _root = match decoder.next() { -- 2.20.1