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 39C33993D for ; Tue, 5 Sep 2023 11:38:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 115F717E8D for ; Tue, 5 Sep 2023 11:37:53 +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 for ; Tue, 5 Sep 2023 11:37:51 +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 5065B420EE for ; Tue, 5 Sep 2023 11:37:51 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Tue, 5 Sep 2023 11:37:47 +0200 Message-Id: <20230905093747.54879-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.433 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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. [datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup] fix #4823: datastore: ignore vanished files when walking directory 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, 05 Sep 2023 09:38:23 -0000 When walking through a datastore on a GC run, it can happen that the snapshot is deleted, and then walked over. For example: - read dir entry for group - walk entries (snapshots) - snapshot X is removed/pruned - walking reaches snapshot X, but ENOENT Previously we bailed here, now we just ignore it. Signed-off-by: Gabriel Goller --- pbs-datastore/src/datastore.rs | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index fe75d9b5..d135ad90 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -869,18 +869,24 @@ impl DataStore { let handle_entry_err = |err: walkdir::Error| { if let Some(inner) = err.io_error() { 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) + match 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) + } + } + io::ErrorKind::NotFound => { + // ignore vanished file + } + _ => { + bail!( + "unexpected error on datastore traversal: {} - {:?}", + inner, + path + ) } - } else { - bail!( - "unexpected error on datastore traversal: {} - {:?}", - inner, - path - ) } } else { bail!("unexpected error on datastore traversal: {}", inner) -- 2.39.2