From: Robert Obkircher <r.obkircher@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup 4/9] datastore: fix inconsistent implementation of index_size method
Date: Fri, 31 Jul 2026 16:21:17 +0200 [thread overview]
Message-ID: <20260731142430.289893-5-r.obkircher@proxmox.com> (raw)
In-Reply-To: <20260731142430.289893-1-r.obkircher@proxmox.com>
Return the file size of fixed index files, just like for dynamic ones.
Previously, the size of the referenced backup contents was returned,
which is still available via the index_bytes method.
The impact of this change should be fairly small, as this only seems
to be used by "proxmox-backup-debug inspect file". The original
intention was probably to show the file size there, because it also
does that for blobs.
Fixes: f0d23e537 ("add ctime and size function to IndexFile trait")
Signed-off-by: Robert Obkircher <r.obkircher@proxmox.com>
---
pbs-datastore/src/fixed_index.rs | 4 ++--
pbs-datastore/src/index.rs | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pbs-datastore/src/fixed_index.rs b/pbs-datastore/src/fixed_index.rs
index 8104cbe72..0145f93d3 100644
--- a/pbs-datastore/src/fixed_index.rs
+++ b/pbs-datastore/src/fixed_index.rs
@@ -187,7 +187,7 @@ impl IndexFile for FixedIndexReader {
}
fn index_size(&self) -> usize {
- self.size as usize
+ size_of::<FixedIndexHeader>() + self.index_length * 32
}
fn compute_csum(&self) -> ([u8; 32], u64) {
@@ -658,7 +658,7 @@ mod tests {
fs::write(&path, &data).unwrap();
let reader = FixedIndexReader::open(&path).unwrap();
assert_eq!(reader.index_bytes(), size);
- assert_eq!(reader.index_size(), size as usize);
+ assert_eq!(reader.index_size(), 4096 + 64);
assert_eq!(reader.chunk_size, chunk_size as usize);
assert_eq!(reader.index_count(), 2);
assert_eq!(
diff --git a/pbs-datastore/src/index.rs b/pbs-datastore/src/index.rs
index b5d20ad91..4c0e9aefb 100644
--- a/pbs-datastore/src/index.rs
+++ b/pbs-datastore/src/index.rs
@@ -20,9 +20,14 @@ impl ChunkReadInfo {
pub trait IndexFile {
fn index_count(&self) -> usize;
fn index_digest(&self, pos: usize) -> Option<&[u8; 32]>;
+
+ /// The total size of the referenced backup content.
fn index_bytes(&self) -> u64;
+
fn chunk_info(&self, pos: usize) -> Option<ChunkReadInfo>;
fn index_ctime(&self) -> i64;
+
+ /// The size of the index file including the header.
fn index_size(&self) -> usize;
/// Get the chunk index and the relative offset within it for a byte offset
--
2.47.3
next prev parent reply other threads:[~2026-07-31 14:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-31 14:21 [PATCH proxmox{,-backup} 0/9] support index readers on larger page sizes Robert Obkircher
2026-07-31 14:21 ` [PATCH proxmox 1/9] proxmox-sys: add len and as_non_null method to Mmap Robert Obkircher
2026-07-31 14:21 ` [PATCH proxmox-backup 2/9] datastore: limit scope of mutable reference in FixedIndexWriter::close Robert Obkircher
2026-07-31 14:21 ` [PATCH proxmox-backup 3/9] datastore: add tests for fixed and dynamic index reader Robert Obkircher
2026-07-31 14:21 ` Robert Obkircher [this message]
2026-07-31 14:21 ` [PATCH proxmox-backup 5/9] bin: debug: print referenced backup size for index files Robert Obkircher
2026-07-31 14:21 ` [PATCH proxmox-backup 6/9] datastore: check that index files are regular files Robert Obkircher
2026-07-31 14:21 ` [PATCH proxmox-backup 7/9] datastore: simplify FixedIndexReader::chunk_info Robert Obkircher
2026-07-31 14:21 ` [PATCH proxmox-backup 8/9] datastore: always access dynamic index reader slice through method Robert Obkircher
2026-07-31 14:21 ` [PATCH proxmox-backup 9/9] fix #7244: datastore: always mmap index files from offset 0 Robert Obkircher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260731142430.289893-5-r.obkircher@proxmox.com \
--to=r.obkircher@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox