[pbs-devel] [PATCH proxmox-backup v6 12/21] chunk store: rename cache-specific helpers

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

From: Fabian Grünbichler <f.gruenbichler@proxmox.com>

to make it more explicit that these operate in cache context, and are not
generic helpers as the original names kind of imply.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 pbs-datastore/src/chunk_store.rs               | 4 ++--
 pbs-datastore/src/local_datastore_lru_cache.rs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs
index a17c258a7..f5a77276d 100644
--- a/pbs-datastore/src/chunk_store.rs
+++ b/pbs-datastore/src/chunk_store.rs
@@ -699,7 +699,7 @@ impl ChunkStore {
     /// for garbage collection. Returns with success also if chunk file is not pre-existing.
     ///
     /// Safety: chunk store mutex must be held!
-    pub(crate) unsafe fn clear_chunk(&self, digest: &[u8; 32]) -> Result<(), Error> {
+    pub(crate) unsafe fn replace_chunk_with_marker(&self, digest: &[u8; 32]) -> Result<(), Error> {
         let (chunk_path, digest_str) = self.chunk_path(digest);
         let mut create_options = CreateOptions::new();
         if nix::unistd::Uid::effective().is_root() {
@@ -717,7 +717,7 @@ impl ChunkStore {
     ///
     /// Callers must hold the per-chunk file lock in order to avoid races with renaming of corrupt
     /// chunks by verifications and chunk inserts by backups.
-    pub(crate) fn remove_chunk(&self, digest: &[u8; 32]) -> Result<(), Error> {
+    pub(crate) fn remove_chunk_marker(&self, digest: &[u8; 32]) -> Result<(), Error> {
         let (chunk_path, _digest_str) = self.chunk_path(digest);
         std::fs::remove_file(chunk_path).map_err(Error::from)
     }
diff --git a/pbs-datastore/src/local_datastore_lru_cache.rs b/pbs-datastore/src/local_datastore_lru_cache.rs
index 8b2dbedfd..ae2215be1 100644
--- a/pbs-datastore/src/local_datastore_lru_cache.rs
+++ b/pbs-datastore/src/local_datastore_lru_cache.rs
@@ -42,7 +42,7 @@ impl LocalDatastoreLruCache {
         }
         self.cache.insert(*digest, (), |digest| {
             // Safety: lock acquired above, this is executed inline!
-            unsafe { self.store.clear_chunk(&digest) }
+            unsafe { self.store.replace_chunk_with_marker(&digest) }
         })
     }
 
@@ -59,7 +59,7 @@ impl LocalDatastoreLruCache {
     /// Fails if the chunk cannot be deleted successfully.
     pub(crate) unsafe fn remove(&self, digest: &[u8; 32]) -> Result<(), Error> {
         self.cache.remove(*digest);
-        self.store.remove_chunk(digest)
+        self.store.remove_chunk_marker(digest)
     }
 
     /// Access the locally cached chunk or fetch it from the S3 object store via the provided
@@ -80,7 +80,7 @@ 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.clear_chunk(&digest) }
+                        unsafe { self.store.replace_chunk_with_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