From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 80DEB1FF0AA for ; Tue, 17 Nov 2026 16:28:39 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id C71D12168B; Tue, 17 Nov 2026 16:28:34 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup 06/10] bin: debug: refactore dynamic index reader opening logic into helper Date: Tue, 17 Nov 2026 16:28:10 +0100 Message-ID: <20261117152814.491323-7-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261117152814.491323-1-c.ebner@proxmox.com> References: <20261117152814.491323-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794929311299 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.369 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) 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 Message-ID-Hash: MTOFLH3N2RP3TPVIUMSXLFKUW7HHETWW X-Message-ID-Hash: MTOFLH3N2RP3TPVIUMSXLFKUW7HHETWW X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Factor out the logic to open a buffered local dynamic index reader into a reusable helper function. In preparation for supporting diff'ing split pxar archives, where both the metadata and payload archive index readers need to be opened. Signed-off-by: Christian Ebner --- src/bin/proxmox_backup_debug/diff.rs | 37 +++++++++++++++++++--------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/src/bin/proxmox_backup_debug/diff.rs b/src/bin/proxmox_backup_debug/diff.rs index a6e12f3d8..caacea21e 100644 --- a/src/bin/proxmox_backup_debug/diff.rs +++ b/src/bin/proxmox_backup_debug/diff.rs @@ -23,6 +23,7 @@ use pbs_client::tools::{ optional_ns_param, }; use pbs_client::{BackupReader, BackupRepository, BackupTargetArgs, RemoteChunkReader}; +use pbs_datastore::BackupManifest; use pbs_datastore::dynamic_index::{BufferedDynamicReader, DynamicIndexReader, LocalDynamicReadAt}; use pbs_datastore::index::IndexFile; use pbs_key_config::decrypt_key; @@ -246,25 +247,19 @@ struct OutputParams { color: ColorMode, } -async fn open_dynamic_index( - snapshot: &str, +async fn open_dynamic_index_reader( + backup_reader: &Arc, + manifest: &BackupManifest, archive_name: &BackupArchiveName, params: &RepoParams, -) -> Result<(DynamicIndexReader, Accessor), Error> { - let backup_reader = create_backup_reader(snapshot, params).await?; - - let (manifest, _) = backup_reader - .download_manifest(params.ignore_missing_signature) - .await?; - manifest.check_fingerprint(params.crypt_config.as_ref().map(Arc::as_ref))?; - +) -> Result<(DynamicIndexReader, Arc, u64), Error> { let index = backup_reader - .download_dynamic_index(&manifest, archive_name) + .download_dynamic_index(manifest, archive_name) .await?; let most_used = index.find_most_used_chunks(8); let lookup_index = backup_reader - .download_dynamic_index(&manifest, archive_name) + .download_dynamic_index(manifest, archive_name) .await?; let file_info = manifest.lookup_file_info(archive_name)?; @@ -278,6 +273,24 @@ async fn open_dynamic_index( let reader = BufferedDynamicReader::new(index, chunk_reader); let archive_size = reader.archive_size(); let reader: Arc = Arc::new(LocalDynamicReadAt::new(reader)); + + Ok((lookup_index, reader, archive_size)) +} + +async fn open_dynamic_index( + snapshot: &str, + archive_name: &BackupArchiveName, + params: &RepoParams, +) -> Result<(DynamicIndexReader, Accessor), Error> { + let backup_reader = create_backup_reader(snapshot, params).await?; + + let (manifest, _) = backup_reader + .download_manifest(params.ignore_missing_signature) + .await?; + manifest.check_fingerprint(params.crypt_config.as_ref().map(Arc::as_ref))?; + + let (lookup_index, reader, archive_size) = + open_dynamic_index_reader(&backup_reader, &manifest, archive_name, params).await?; let accessor = Accessor::new(pxar::PxarVariant::Unified(reader), archive_size).await?; Ok((lookup_index, accessor)) -- 2.47.3