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 7B83F69D96 for ; Wed, 20 Jan 2021 17:24:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 799E9ADFB for ; Wed, 20 Jan 2021 17:24:50 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 1340DADF1 for ; Wed, 20 Jan 2021 17:24:50 +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 D58994604B for ; Wed, 20 Jan 2021 17:24:49 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Wed, 20 Jan 2021 17:23:53 +0100 Message-Id: <20210120162355.2750802-7-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210120162355.2750802-1-f.gruenbichler@proxmox.com> References: <20210120162355.2750802-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 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 6/8] rework GC traversal error handling 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, 20 Jan 2021 16:24:50 -0000 the error message don't make sense with an empty default Signed-off-by: Fabian Grünbichler --- src/backup/datastore.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs index 34865380..fae7ff25 100644 --- a/src/backup/datastore.rs +++ b/src/backup/datastore.rs @@ -395,16 +395,18 @@ impl DataStore { } let handle_entry_err = |err: walkdir::Error| { if let Some(inner) = err.io_error() { - let path = err.path().unwrap_or(Path::new("")); - match inner.kind() { - io::ErrorKind::PermissionDenied => { + if let Some(path) = err.path() { + if inner.kind() == io::ErrorKind::PermissionDenied { // only allow to skip ext4 fsck directory, avoid GC if, for example, // a user got file permissions wrong on datastore rsync to new server if err.depth() > 1 || !path.ends_with("lost+found") { - bail!("cannot continue garbage-collection safely, permission denied on: {}", path.display()) + bail!("cannot continue garbage-collection safely, permission denied on: {:?}", path) } - }, - _ => bail!("unexpected error on datastore traversal: {} - {}", inner, path.display()), + } else { + bail!("unexpected error on datastore traversal: {} - {:?}", inner, path) + } + } else { + bail!("unexpected error on datastore traversal: {}", inner) } } Ok(()) -- 2.20.1