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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2FAAE7A445 for ; Fri, 7 May 2021 12:50:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1AF7929B05 for ; Fri, 7 May 2021 12:49:59 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9494C29AF7 for ; Fri, 7 May 2021 12:49:58 +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 67BC546536 for ; Fri, 7 May 2021 12:49:58 +0200 (CEST) To: Proxmox Backup Server development discussion , Dominik Csapak References: <20210506122008.11297-1-d.csapak@proxmox.com> <20210506122008.11297-2-d.csapak@proxmox.com> From: Dietmar Maurer Message-ID: <7f51581a-2744-5363-e1c3-565a6f1218b3@proxmox.com> Date: Fri, 7 May 2021 12:49:57 +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: <20210506122008.11297-2-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.229 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 v3 1/7] api2/tape/restore: return backup manifest in 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: Fri, 07 May 2021 10:50:29 -0000 applied On 5/6/21 2:20 PM, Dominik Csapak wrote: > we'll use that for partial snapshot restore > > Signed-off-by: Dominik Csapak > --- > src/api2/tape/restore.rs | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs > index f3452364..9884b379 100644 > --- a/src/api2/tape/restore.rs > +++ b/src/api2/tape/restore.rs > @@ -800,7 +800,7 @@ fn try_restore_snapshot_archive( > worker: Arc, > decoder: &mut pxar::decoder::sync::Decoder, > snapshot_path: &Path, > -) -> Result<(), Error> { > +) -> Result { > > let _root = match decoder.next() { > None => bail!("missing root entry"), > @@ -886,9 +886,10 @@ fn try_restore_snapshot_archive( > } > } > > - if manifest.is_none() { > - bail!("missing manifest"); > - } > + let manifest = match manifest { > + None => bail!("missing manifest"), > + Some(manifest) => manifest, > + }; > > // Do not verify anything here, because this would be to slow (causes tape stops). > > @@ -902,7 +903,7 @@ fn try_restore_snapshot_archive( > bail!("Atomic rename manifest {:?} failed - {}", manifest_path, err); > } > > - Ok(()) > + Ok(manifest) > } > > /// Try to restore media catalogs (form catalog_archives)