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 4258A79D67 for ; Thu, 6 May 2021 08:02:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3F9C11B9BB for ; Thu, 6 May 2021 08:02:35 +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 B83261B9AC for ; Thu, 6 May 2021 08:02:34 +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 90EFD4202C for ; Thu, 6 May 2021 08:02:34 +0200 (CEST) To: Proxmox Backup Server development discussion , Dominik Csapak References: <20210505100918.506-1-d.csapak@proxmox.com> <20210505100918.506-5-d.csapak@proxmox.com> From: Dietmar Maurer Message-ID: <826bc75c-3040-254c-c1c4-b6336cb85147@proxmox.com> Date: Thu, 6 May 2021 08:02:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210505100918.506-5-d.csapak@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-SPAM-LEVEL: Spam detection results: 0 AWL 0.246 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] applied: [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: Thu, 06 May 2021 06:02:35 -0000 applied On 5/5/21 12:09 PM, Dominik Csapak wrote: > 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() {