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 29F8C69CFA for ; Fri, 25 Mar 2022 13:38:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1CB7418AB for ; Fri, 25 Mar 2022 13:38:19 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E22A1189F for ; Fri, 25 Mar 2022 13:38:17 +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 A9608458F8 for ; Fri, 25 Mar 2022 13:38:17 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 25 Mar 2022 13:38:16 +0100 Message-Id: <20220325123816.3865356-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.148 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup] rest-server: cleanup_old_tasks: improve 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: Fri, 25 Mar 2022 12:38:19 -0000 by not bubbling up most errors, and continuing on. this avoids that we stop cleaning up because e.g. one directory was missing. Signed-off-by: Dominik Csapak --- proxmox-rest-server/src/worker_task.rs | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs index 643e1872..619b8e9d 100644 --- a/proxmox-rest-server/src/worker_task.rs +++ b/proxmox-rest-server/src/worker_task.rs @@ -270,18 +270,33 @@ pub fn cleanup_old_tasks(compressed: bool) -> Result<(), Error> { for i in 0..256 { let mut path = setup.taskdir.clone(); path.push(format!("{:02X}", i)); - for file in std::fs::read_dir(path)? { - let file = file?; + let files = match std::fs::read_dir(path) { + Ok(files) => files, + Err(_) => continue, // does not exist or no permissions + }; + for file in files { + let file = match file { + Ok(file) => file, + Err(err) => { + log::error!("task cleanup: could not check some file in {}: {}", i, err); + continue; + } + }; let path = file.path(); - let modified = get_modified(file) - .map_err(|err| format_err!("error getting mtime for {:?}: {}", path, err))?; + let modified = match get_modified(file) { + Ok(modified) => modified, + Err(err) => { + log::error!("task cleanup: error getting mtime for {:?}: {}", path, err); + continue; + } + }; if modified < cutoff_time { match std::fs::remove_file(path) { Ok(()) => {}, Err(err) if err.kind() == std::io::ErrorKind::NotFound => {}, - Err(err) => bail!("could not remove file: {}", err), + Err(err) => log::error!("task cleanup: could not remove file: {}", err), } } } -- 2.30.2