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 AA4C81FF141 for ; Fri, 30 Jan 2026 17:46:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C6E8F2ED9; Fri, 30 Jan 2026 17:47:06 +0100 (CET) From: Robert Obkircher To: pbs-devel@lists.proxmox.com Subject: [PATCH v5 proxmox-backup 01/16] datastore: remove Arc from FixedIndexWriter Date: Fri, 30 Jan 2026 17:45:25 +0100 Message-ID: <20260130164552.281581-2-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260130164552.281581-1-r.obkircher@proxmox.com> References: <20260130164552.281581-1-r.obkircher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1769791522685 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.247 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 ENA_SUBJ_ODD_CASE 2.6 Subject has odd case 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 Message-ID-Hash: IW4OKHVN3HJD6B5RUTX6B4SCZW6M46MF X-Message-ID-Hash: IW4OKHVN3HJD6B5RUTX6B4SCZW6M46MF X-MailFrom: r.obkircher@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: The ChunkStore reference can be safely removed, because it was only needed for the base directory. As discussed previously in the context of the DynamicIndexWriter [1], it is the callers responsibility to ensure that the writer doesn't outlive any locks. This simplifies testing the writer, which would otherwise require a workaround to avoid creating 65k directories. [1] https://lore.proxmox.com/pbs-devel/1761822027.sm41v71zmk.astroid@yuna.none/ Signed-off-by: Robert Obkircher --- pbs-datastore/src/datastore.rs | 10 ++-------- pbs-datastore/src/fixed_index.rs | 7 ++----- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 7ad3d917..1c631817 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -698,14 +698,8 @@ impl DataStore { size: usize, chunk_size: usize, ) -> Result { - let index = FixedIndexWriter::create( - self.inner.chunk_store.clone(), - filename.as_ref(), - size, - chunk_size, - )?; - - Ok(index) + let full_path = self.inner.chunk_store.relative_path(filename.as_ref()); + FixedIndexWriter::create(full_path, size, chunk_size) } pub fn open_fixed_reader>( diff --git a/pbs-datastore/src/fixed_index.rs b/pbs-datastore/src/fixed_index.rs index 6c3be2d4..becbe3e3 100644 --- a/pbs-datastore/src/fixed_index.rs +++ b/pbs-datastore/src/fixed_index.rs @@ -4,14 +4,12 @@ use std::io::{Seek, SeekFrom}; use std::os::unix::io::AsRawFd; use std::path::{Path, PathBuf}; use std::ptr::NonNull; -use std::sync::Arc; use anyhow::{bail, format_err, Error}; use proxmox_io::ReadExt; use proxmox_uuid::Uuid; -use crate::chunk_store::ChunkStore; use crate::file_formats; use crate::index::{ChunkReadInfo, IndexFile}; @@ -240,12 +238,11 @@ impl FixedIndexWriter { #[allow(clippy::cast_ptr_alignment)] // Requires obtaining a shared chunk store lock beforehand pub fn create( - store: Arc, - path: &Path, + full_path: impl Into, size: usize, chunk_size: usize, ) -> Result { - let full_path = store.relative_path(path); + let full_path = full_path.into(); let mut tmp_path = full_path.clone(); tmp_path.set_extension("tmp_fidx"); -- 2.47.3