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 66A111FF141 for ; Fri, 30 Jan 2026 17:47:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 81AF132B1; Fri, 30 Jan 2026 17:47:35 +0100 (CET) From: Robert Obkircher To: pbs-devel@lists.proxmox.com Subject: [PATCH v5 proxmox-backup 15/16] datastore: FixedIndexWriter: switch public chunk_size to u32 Date: Fri, 30 Jan 2026 17:45:39 +0100 Message-ID: <20260130164552.281581-16-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: 1769791552622 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.057 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 Message-ID-Hash: GIWFJYSGGPGLKZTMVMO5L42Z7YHOADYT X-Message-ID-Hash: GIWFJYSGGPGLKZTMVMO5L42Z7YHOADYT 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: I'm not sure if this patch should be applied. Signed-off-by: Robert Obkircher --- pbs-datastore/src/datastore.rs | 4 ++-- pbs-datastore/src/fixed_index.rs | 6 +++--- src/api2/backup/environment.rs | 2 +- src/api2/backup/mod.rs | 4 +--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 69bde917..98eab18d 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -696,10 +696,10 @@ impl DataStore { &self, filename: P, size: Option, - chunk_size: u64, + chunk_size: u32, ) -> Result { let full_path = self.inner.chunk_store.relative_path(filename.as_ref()); - FixedIndexWriter::create(full_path, size, chunk_size) + FixedIndexWriter::create(full_path, size, chunk_size.into()) } pub fn open_fixed_reader>( diff --git a/pbs-datastore/src/fixed_index.rs b/pbs-datastore/src/fixed_index.rs index e8c14e5c..3fa146f8 100644 --- a/pbs-datastore/src/fixed_index.rs +++ b/pbs-datastore/src/fixed_index.rs @@ -531,12 +531,12 @@ impl FixedIndexWriter { /// If this writer has been created without a fixed size, the /// index capacity and content size are increased automatically /// until an incomplete chunk is encountered. - pub fn add_chunk(&mut self, start: u64, size: u64, digest: &[u8; 32]) -> Result<(), Error> { - let Some(end) = start.checked_add(size) else { + pub fn add_chunk(&mut self, start: u64, size: u32, digest: &[u8; 32]) -> Result<(), Error> { + let Some(end) = start.checked_add(size.into()) else { bail!("add_chunk: start and size are too large: {start}+{size}"); }; self.grow_to_size(end)?; - let idx = self.check_chunk_alignment(end, size)?; + let idx = self.check_chunk_alignment(end, size.into())?; self.add_digest(idx, digest) } diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs index 9773a87a..9645f6de 100644 --- a/src/api2/backup/environment.rs +++ b/src/api2/backup/environment.rs @@ -442,7 +442,7 @@ impl BackupEnvironment { ); } - data.index.add_chunk(offset, size.into(), digest)?; + data.index.add_chunk(offset, size, digest)?; data.chunk_count += 1; diff --git a/src/api2/backup/mod.rs b/src/api2/backup/mod.rs index 55207e6c..4d0846ca 100644 --- a/src/api2/backup/mod.rs +++ b/src/api2/backup/mod.rs @@ -528,9 +528,7 @@ fn create_fixed_index( reader = Some(index); } - let mut writer = env - .datastore - .create_fixed_writer(&path, size, chunk_size.into())?; + let mut writer = env.datastore.create_fixed_writer(&path, size, chunk_size)?; if let Some(reader) = reader { writer.clone_data_from(&reader)?; -- 2.47.3