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 20DB69EFA7 for ; Wed, 7 Jun 2023 16:12:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 02D151A928 for ; Wed, 7 Jun 2023 16:11: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 ; Wed, 7 Jun 2023 16:11:53 +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 367E041F36 for ; Wed, 7 Jun 2023 16:11:53 +0200 (CEST) Date: Wed, 7 Jun 2023 16:11:52 +0200 (CEST) From: Maximiliano Sandoval To: Proxmox Backup Server development discussion Message-ID: <1317042869.361.1686147112327@webmail.proxmox.com> In-Reply-To: <20230607140701.125092-2-m.sandoval@proxmox.com> References: <20230607140701.125092-1-m.sandoval@proxmox.com> <20230607140701.125092-2-m.sandoval@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.6-Rev45 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 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 pbs 2/2] fix #4761: pbs-client: backup_writer: improve error reporting 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, 07 Jun 2023 14:12:25 -0000 I have put the wrong issue number in the commit title, it is actually 4591. > On 07.06.2023 16:07 CEST Maximiliano Sandoval wrote: > > > We check if the manifest contains an index for the requested archive, if > it does not we avoid downloading it and report a more helpful error > message. > > Signed-off-by: Maximiliano Sandoval > --- > Best viewed with git diff -w. > > pbs-client/src/backup_writer.rs | 56 +++++++++++++++++++-------------- > 1 file changed, 32 insertions(+), 24 deletions(-) > > diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writer.rs > index 2e18a060..03dbcab7 100644 > --- a/pbs-client/src/backup_writer.rs > +++ b/pbs-client/src/backup_writer.rs > @@ -282,33 +282,41 @@ impl BackupWriter { > let close_path = format!("{}_close", prefix); > > if let Some(manifest) = options.previous_manifest { > - // try, but ignore errors > - match ArchiveType::from_path(archive_name) { > - Ok(ArchiveType::FixedIndex) => { > - if let Err(err) = self > - .download_previous_fixed_index( > - archive_name, > - &manifest, > - known_chunks.clone(), > - ) > - .await > - { > - log::warn!("Error downloading .fidx from previous manifest: {}", err); > + if !manifest > + .files() > + .iter() > + .any(|file| file.filename == archive_name) > + { > + log::info!("There is no index with the name {archive_name}"); > + } else { > + // try, but ignore errors > + match ArchiveType::from_path(archive_name) { > + Ok(ArchiveType::FixedIndex) => { > + if let Err(err) = self > + .download_previous_fixed_index( > + archive_name, > + &manifest, > + known_chunks.clone(), > + ) > + .await > + { > + log::warn!("Error downloading .fidx from previous manifest: {}", err); > + } > } > - } > - Ok(ArchiveType::DynamicIndex) => { > - if let Err(err) = self > - .download_previous_dynamic_index( > - archive_name, > - &manifest, > - known_chunks.clone(), > - ) > - .await > - { > - log::warn!("Error downloading .didx from previous manifest: {}", err); > + Ok(ArchiveType::DynamicIndex) => { > + if let Err(err) = self > + .download_previous_dynamic_index( > + archive_name, > + &manifest, > + known_chunks.clone(), > + ) > + .await > + { > + log::warn!("Error downloading .didx from previous manifest: {}", err); > + } > } > + _ => { /* do nothing */ } > } > - _ => { /* do nothing */ } > } > } > > -- > 2.39.2 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel