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 1C3ED61FBD for ; Tue, 8 Sep 2020 11:18:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0CD7B1351E for ; Tue, 8 Sep 2020 11:18:12 +0200 (CEST) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id AC86813514 for ; Tue, 8 Sep 2020 11:18:10 +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 7548C44A97 for ; Tue, 8 Sep 2020 11:18:10 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Tue, 8 Sep 2020 11:18:04 +0200 Message-Id: <20200908091804.27685-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.053 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup] gc: attach context to index reader errors and ignore NotFound 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: Tue, 08 Sep 2020 09:18:42 -0000 Ignore NotFound errors during phase 1, this just means that a snapshot was forgotten or pruned between scanning for .fidx/.didx files and actually opening the index to touch the chunks. ignore_notfound has to be a real function, since generics are not supported for closures. The open methods for dynamic and fixed indices are switched from the usual format_err! to err.context() to allow checking for the root error (and thus the io::ErrorKind) further up the call chain. Signed-off-by: Stefan Reiter --- src/backup/datastore.rs | 28 ++++++++++++++++++++++++---- src/backup/dynamic_index.rs | 5 ++++- src/backup/fixed_index.rs | 7 +++++-- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs index ebe47487..1f455d64 100644 --- a/src/backup/datastore.rs +++ b/src/backup/datastore.rs @@ -426,6 +426,20 @@ impl DataStore { Ok(()) } + fn ignore_notfound(res: Result) -> Result, Error> { + match res { + Ok(t) => Ok(Some(t)), + Err(err) => { + if let Some(ioerr) = err.downcast_ref::() { + if ioerr.kind() == std::io::ErrorKind::NotFound { + return Ok(None); + } + } + Err(err) + } + } + } + fn mark_used_chunks(&self, status: &mut GarbageCollectionStatus, worker: &WorkerTask) -> Result<(), Error> { let image_list = self.list_images()?; @@ -443,11 +457,17 @@ impl DataStore { if let Ok(archive_type) = archive_type(&path) { if archive_type == ArchiveType::FixedIndex { - let index = self.open_fixed_reader(&path)?; - self.index_mark_used_chunks(index, &path, status, worker)?; + if let Some(index) = Self::ignore_notfound(self.open_fixed_reader(&path))? { + self.index_mark_used_chunks(index, &path, status, worker)?; + } else { + worker.warn(format!("warning: could no longer find fixed index '{:?}'", &path)); + } } else if archive_type == ArchiveType::DynamicIndex { - let index = self.open_dynamic_reader(&path)?; - self.index_mark_used_chunks(index, &path, status, worker)?; + if let Some(index) = Self::ignore_notfound(self.open_dynamic_reader(&path))? { + self.index_mark_used_chunks(index, &path, status, worker)?; + } else { + worker.warn(format!("warning: could no longer find dynamic index '{:?}'", &path)); + } } } done += 1; diff --git a/src/backup/dynamic_index.rs b/src/backup/dynamic_index.rs index f70aa44f..a7ce0f24 100644 --- a/src/backup/dynamic_index.rs +++ b/src/backup/dynamic_index.rs @@ -86,7 +86,10 @@ impl DynamicIndexReader { File::open(path) .map_err(Error::from) .and_then(Self::new) - .map_err(|err| format_err!("Unable to open dynamic index {:?} - {}", path, err)) + .map_err(|err| { + let msg = format!("Unable to open dynamic index {:?} - {}", path, err); + err.context(msg) + }) } pub fn new(mut file: std::fs::File) -> Result { diff --git a/src/backup/fixed_index.rs b/src/backup/fixed_index.rs index 5d6cc1ff..bf864173 100644 --- a/src/backup/fixed_index.rs +++ b/src/backup/fixed_index.rs @@ -1,4 +1,4 @@ -use anyhow::{bail, format_err, Error}; +use anyhow::{bail, Error}; use std::io::{Seek, SeekFrom}; use super::chunk_stat::*; @@ -62,7 +62,10 @@ impl FixedIndexReader { File::open(path) .map_err(Error::from) .and_then(|file| Self::new(file)) - .map_err(|err| format_err!("Unable to open fixed index {:?} - {}", path, err)) + .map_err(|err| { + let msg = format!("Unable to open fixed index {:?} - {}", path, err); + err.context(msg) + }) } pub fn new(mut file: std::fs::File) -> Result { -- 2.20.1