[pbs-devel] [PATCH proxmox-backup v2 3/4] chunk store: clarify chunk marker helper creates marker if missing

[Christian Ebner <c.ebner@proxmox.com>]

Rename replace_chunk_with_marker() to
replace_chunk_with_marker_or_create_marker() and adapt the docstring
so it is clear that this also creates the marker if the chunk file
is missing.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
Changes since version 1:
- not present

 pbs-datastore/src/chunk_store.rs               |  8 ++++++--
 pbs-datastore/src/datastore.rs                 |  4 +++-
 pbs-datastore/src/local_datastore_lru_cache.rs | 10 ++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs
index 143848838..f53460664 100644
--- a/pbs-datastore/src/chunk_store.rs
+++ b/pbs-datastore/src/chunk_store.rs
@@ -716,10 +716,14 @@ impl ChunkStore {
     /// Replace a chunk file with a zero size file in the chunk store.
     ///
     /// Used to evict chunks from the local datastore cache, while keeping them as in-use markers
-    /// for garbage collection. Returns with success also if chunk file is not pre-existing.
+    /// for garbage collection. Returns with success also if chunk file is not pre-existing,
+    /// also creating the marker file in that case.
     ///
     /// Safety: chunk store mutex must be held!
-    pub(crate) unsafe fn replace_chunk_with_marker(&self, digest: &[u8; 32]) -> Result<(), Error> {
+    pub(crate) unsafe fn replace_chunk_with_marker_or_create_marker(
+        &self,
+        digest: &[u8; 32],
+    ) -> Result<(), Error> {
         let (chunk_path, digest_str) = self.chunk_path(digest);
         Self::create_marker_file(&chunk_path)
             .map_err(|err| format_err!("clear chunk failed for {digest_str} - {err}"))?;
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index 1b489b449..d88785c6d 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -1714,7 +1714,9 @@ impl DataStore {
                             if self.inner.chunk_store.clear_chunk_expected_mark(&digest)? {
                                 unsafe {
                                     // chunk store lock held
-                                    self.inner.chunk_store.replace_chunk_with_marker(&digest)?;
+                                    self.inner
+                                        .chunk_store
+                                        .replace_chunk_with_marker_or_create_marker(&digest)?;
                                 }
                                 Some(SystemTime::now())
                             } else {
diff --git a/pbs-datastore/src/local_datastore_lru_cache.rs b/pbs-datastore/src/local_datastore_lru_cache.rs
index ae2215be1..f39b26ebb 100644
--- a/pbs-datastore/src/local_datastore_lru_cache.rs
+++ b/pbs-datastore/src/local_datastore_lru_cache.rs
@@ -42,7 +42,10 @@ impl LocalDatastoreLruCache {
         }
         self.cache.insert(*digest, (), |digest| {
             // Safety: lock acquired above, this is executed inline!
-            unsafe { self.store.replace_chunk_with_marker(&digest) }
+            unsafe {
+                self.store
+                    .replace_chunk_with_marker_or_create_marker(&digest)
+            }
         })
     }
 
@@ -80,7 +83,10 @@ impl LocalDatastoreLruCache {
                     let _lock = self.store.mutex().lock().unwrap();
                     self.cache.insert(*digest, (), |digest| {
                         // Safety: lock acquired above, this is executed inline
-                        unsafe { self.store.replace_chunk_with_marker(&digest) }
+                        unsafe {
+                            self.store
+                                .replace_chunk_with_marker_or_create_marker(&digest)
+                        }
                     })?;
                     Ok(Some(chunk))
                 }
-- 
2.47.3



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel