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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E93166BB0E for ; Wed, 27 Jan 2021 14:43:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D04DA22B8A for ; Wed, 27 Jan 2021 14:43:15 +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 5485B22B81 for ; Wed, 27 Jan 2021 14:43:15 +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 126B646125 for ; Wed, 27 Jan 2021 14:43:15 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 27 Jan 2021 14:43:14 +0100 Message-Id: <20210127134314.22530-1-d.csapak@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.252 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] [RFC proxmox-backup] backup/backup_info: ignore vanished backup dirs during listing 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, 27 Jan 2021 13:43:46 -0000 this had the effect that that a snapshot listing errored out when called during a prune action we now ignore such errors and simply return no files also add some context for the error if one happens Signed-off-by: Dominik Csapak --- maybe we also want to filter such snapshots out one level higher? so that we do not show 'empty' snapshots src/backup/backup_info.rs | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/backup/backup_info.rs b/src/backup/backup_info.rs index 5ff1a6f8..dba3fea5 100644 --- a/src/backup/backup_info.rs +++ b/src/backup/backup_info.rs @@ -1,4 +1,7 @@ -use crate::tools; +use crate::tools::{ + self, + fs::FileIterOps, +}; use anyhow::{bail, format_err, Error}; use std::os::unix::io::RawFd; @@ -339,11 +342,24 @@ impl BackupInfo { fn list_backup_files(dirfd: RawFd, path: &P) -> Result, Error> { let mut files = vec![]; - tools::scandir(dirfd, path, &BACKUP_FILE_REGEX, |_, filename, file_type| { - if file_type != nix::dir::Type::File { return Ok(()); } - files.push(filename.to_owned()); - Ok(()) - })?; + match tools::fs::read_subdir(dirfd, path) { + Ok(iter) => { + for entry in iter.filter_file_name_regex(&BACKUP_FILE_REGEX) { + let entry = entry?; + let file_type = entry.file_type().ok_or_else(|| format_err!("unable to detect file type"))?; + if file_type == nix::dir::Type::File { + // ok because we filtered with BACKUP_FILE_REGEX + let filename = unsafe { entry.file_name_utf8_unchecked() }; + files.push(filename.to_owned()); + } + } + }, + Err(nix::Error::Sys(errno)) if errno == nix::errno::Errno::ENOENT => { + // ignore vanished backup dirs + eprintln!("backup dir vanished during listing"); + }, + Err(err) => bail!("error listing backup files: {}", err), + } Ok(files) } -- 2.20.1