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 7D7DA650B4 for ; Mon, 2 Nov 2020 12:34:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5841F2289F for ; Mon, 2 Nov 2020 12:34:42 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 643C922875 for ; Mon, 2 Nov 2020 12:34:40 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 34BA246008 for ; Mon, 2 Nov 2020 12:34:40 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 2 Nov 2020 12:34:35 +0100 Message-Id: <20201102113439.26618-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201102113439.26618-1-d.csapak@proxmox.com> References: <20201102113439.26618-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.425 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 1/5] garbage collect: improve index error messages 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: Mon, 02 Nov 2020 11:34:42 -0000 so that in case of a broken index file, the user knows which it is Signed-off-by: Dominik Csapak --- src/backup/datastore.rs | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs index 94d0cc04..36ff32c8 100644 --- a/src/backup/datastore.rs +++ b/src/backup/datastore.rs @@ -475,10 +475,22 @@ impl DataStore { Ok(file) => { if let Ok(archive_type) = archive_type(&path) { if archive_type == ArchiveType::FixedIndex { - let index = FixedIndexReader::new(file)?; + let index = FixedIndexReader::new(file).map_err(|err| { + format_err!( + "cannot read fixed index {}: {}", + full_path.to_string_lossy(), + err + ) + })?; self.index_mark_used_chunks(index, &path, status, worker)?; } else if archive_type == ArchiveType::DynamicIndex { - let index = DynamicIndexReader::new(file)?; + let index = DynamicIndexReader::new(file).map_err(|err| { + format_err!( + "cannot read dynamic index {}: {}", + full_path.to_string_lossy(), + err + ) + })?; self.index_mark_used_chunks(index, &path, status, worker)?; } } @@ -487,7 +499,11 @@ impl DataStore { if err.kind() == std::io::ErrorKind::NotFound { // simply ignore vanished files } else { - return Err(err.into()); + return Err(format_err!( + "cannot open index {}: {}", + full_path.to_string_lossy(), + err + )); } } } -- 2.20.1