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 6A92279B87 for ; Wed, 5 May 2021 12:09:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 54D0513BDF for ; Wed, 5 May 2021 12:09:23 +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 06A0013991 for ; Wed, 5 May 2021 12:09:20 +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 D208B42AB8 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:15 +0200 Message-Id: <20210505100918.506-6-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.016 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 5/8] 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: Wed, 05 May 2021 10:09:54 -0000 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) -- 2.20.1