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 E38D9CE46 for ; Tue, 11 Jul 2023 16:17:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C376C2456E for ; Tue, 11 Jul 2023 16:17:55 +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, 11 Jul 2023 16:17:55 +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 B0ABB42EA0 for ; Tue, 11 Jul 2023 16:17:54 +0200 (CEST) Date: Tue, 11 Jul 2023 16:17:53 +0200 From: Wolfgang Bumiller To: Max Carrara Cc: pbs-devel@lists.proxmox.com Message-ID: <7n2bmkf3xbyj5j2h6airezs24dyaoy2fi6ugiuqzqisrjcqkwv@hej4yopid2s4> References: <20230607163428.1154123-1-m.carrara@proxmox.com> <20230607163428.1154123-5-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230607163428.1154123-5-m.carrara@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.121 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pbs-devel] [PATCH proxmox-backup 4/5] proxmox-backup-client: restore: add 'ignore-extract-device-errors' flag 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, 11 Jul 2023 14:17:55 -0000 On Wed, Jun 07, 2023 at 06:34:27PM +0200, Max Carrara wrote: > If this flag is provided, any errors that occur during the extraction > of a device node are silently ignored. > > In addition to this flag and its error handler, the bare scaffold > for supporting multiple error handlers is also added. > > Signed-off-by: Max Carrara > --- > > Notes: > One thing I'm not *really* sure about here is the name of the CLI > flag - to me it feels a little bit too verbose, but it does exactly > what it says. > > proxmox-backup-client/src/main.rs | 61 ++++++++++++++++++++++++++++++- > 1 file changed, 60 insertions(+), 1 deletion(-) > > diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs > index 55198108..1fb8a378 100644 > --- a/proxmox-backup-client/src/main.rs > +++ b/proxmox-backup-client/src/main.rs > @@ -29,6 +29,7 @@ use pbs_api_types::{ > BACKUP_TYPE_SCHEMA, TRAFFIC_CONTROL_BURST_SCHEMA, TRAFFIC_CONTROL_RATE_SCHEMA, > }; > use pbs_client::catalog_shell::Shell; > +use pbs_client::pxar::ErrorHandler as PxarErrorHandler; > use pbs_client::tools::{ > complete_archive_name, complete_auth_id, complete_backup_group, complete_backup_snapshot, > complete_backup_source, complete_chunk_size, complete_group_or_snapshot, > @@ -1232,6 +1233,12 @@ We do not extract '.pxar' archives when writing to standard output. > optional: true, > default: false, > }, > + "ignore-extract-device-errors": { > + type: Boolean, > + description: "ignore errors that occur during device node extraction", > + optional: true, > + default: false, > + } > } > } > )] > @@ -1244,6 +1251,7 @@ async fn restore( > ignore_ownership: bool, > ignore_permissions: bool, > overwrite: bool, > + ignore_extract_device_errors: bool, > ) -> Result { > let repo = extract_repository_from_value(¶m)?; > > @@ -1364,12 +1372,63 @@ async fn restore( > > let mut reader = BufferedDynamicReader::new(index, chunk_reader); > > + fn make_handler_from_many(handlers: I) -> PxarErrorHandler > + where > + I: IntoIterator, > + { > + let mut captured_handlers: Vec = handlers.into_iter().collect(); > + > + let handler: PxarErrorHandler = Box::new(move |error: Error| -> Result<(), Error> { > + let mut res = Err(error); > + > + for handler in captured_handlers.iter_mut() { > + if let Err(error) = res { > + res = handler(error); > + } else { > + return res; > + } > + } > + > + res > + }); > + > + handler > + } > + > + let mut handlers: Vec = Vec::new(); > + > + if ignore_extract_device_errors { > + let on_device_error = Box::new(move |err: Error| { > + use pbs_client::pxar::PxarExtractContext; > + > + let ctx = err.downcast_ref::(); > + > + if ctx.is_none() { Another `is_none()` check + unwrap. How about match err.downcast_ref::() { Some(PxarExtractContext::ExtractDevice) => Ok(()), _ => Err(err), ) ? :) > + return Err(err); > + } > + > + if matches!(ctx.unwrap(), PxarExtractContext::ExtractDevice) { > + return Ok(()); > + } > + > + Err(err) > + }); > + > + handlers.push(on_device_error); > + } > + > + let on_error = if handlers.is_empty() { > + None > + } else { > + Some(make_handler_from_many(handlers)) > + }; > + > let options = pbs_client::pxar::PxarExtractOptions { > match_list: &[], > extract_match_default: true, > allow_existing_dirs, > overwrite, > - on_error: None, > + on_error, > }; > > let mut feature_flags = pbs_client::pxar::Flags::DEFAULT; > -- > 2.30.2 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel > >