From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id CF14D1FF2E0 for ; Mon, 22 Jul 2024 12:30:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 664CC306B7; Mon, 22 Jul 2024 12:31:23 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 22 Jul 2024 12:30:32 +0200 Message-Id: <20240722103034.343303-6-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240722103034.343303-1-c.ebner@proxmox.com> References: <20240722103034.343303-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 Subject: [pbs-devel] [PATCH v2 proxmox-backup 5/7] client: catalog: fallback to metadata archives for catalog dump 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Commit c0302805c "client: backup: conditionally write catalog for file level backups" drops encoding of the dedicated catalog when archives are encoded as split metadata/data archives with the `change-detection-mode` set to `data` or `metadata`. Since the catalog is not present anymore, fallback to use the pxar metadata archives in the manifest (if present) for generating the listing of contents in a compatible manner. Signed-off-by: Christian Ebner --- changes since version 1: - use `pxar_metadata_catalog_dump_dir` over the previous `pxar_metadata_catalog_dump` helper, by passing the archives root dir directly proxmox-backup-client/src/catalog.rs | 41 ++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/proxmox-backup-client/src/catalog.rs b/proxmox-backup-client/src/catalog.rs index 0a374c011..8cb1eb414 100644 --- a/proxmox-backup-client/src/catalog.rs +++ b/proxmox-backup-client/src/catalog.rs @@ -8,11 +8,12 @@ use proxmox_router::cli::*; use proxmox_schema::api; use pbs_api_types::BackupNamespace; -use pbs_client::tools::has_pxar_filename_extension; use pbs_client::tools::key_source::get_encryption_key_password; +use pbs_client::tools::{get_remote_pxar_reader, has_pxar_filename_extension}; use pbs_client::{BackupReader, RemoteChunkReader}; use pbs_tools::crypt_config::CryptConfig; use pbs_tools::json::required_string_param; +use pxar::accessor::aio::Accessor; use crate::helper; use crate::{ @@ -88,14 +89,48 @@ async fn dump_catalog(param: Value) -> Result { let (manifest, _) = client.download_manifest().await?; manifest.check_fingerprint(crypt_config.as_ref().map(Arc::as_ref))?; + let file_info = match manifest.lookup_file_info(CATALOG_NAME) { + Ok(file_info) => file_info, + Err(err) => { + let mut metadata_archives = Vec::new(); + // No catalog, fallback to metadata archives if present + for archive in manifest.files() { + if archive.filename.ends_with(".mpxar.didx") { + metadata_archives.push(archive.filename.clone()); + } + } + metadata_archives.sort_unstable_by(|a, b| a.cmp(b)); + + for archive in &metadata_archives { + let (reader, archive_size) = get_remote_pxar_reader( + &archive, + client.clone(), + &manifest, + crypt_config.clone(), + ) + .await?; + // only care about the metadata, don't attach a payload reader + let reader = pxar::PxarVariant::Unified(reader); + let accessor = Accessor::new(reader, archive_size).await?; + let root_dir = accessor.open_root().await?; + let prefix = format!("./{archive}"); + pbs_client::tools::pxar_metadata_catalog_dump_dir(root_dir, &prefix).await?; + } + + if !metadata_archives.is_empty() { + return Ok(Value::Null); + } + + bail!(err); + } + }; + let index = client .download_dynamic_index(&manifest, CATALOG_NAME) .await?; let most_used = index.find_most_used_chunks(8); - let file_info = manifest.lookup_file_info(CATALOG_NAME)?; - let chunk_reader = RemoteChunkReader::new( client.clone(), crypt_config, -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel