[pbs-devel] [PATCH proxmox-backup v2 04/12] local store cache: replace evicted cache chunks instead of truncate

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

Evicted chunks have been truncated to size zero, keeping the chunk
file in place as in-use marker for the garbage collection but freeing
the chunk file contents. This can however lead to restores failing if
they already opened the chunk file for reading, as their contents are
now incomplete.

Fix this by instead replacing the chunk file with a zero sized file,
leaving the contents accessible for the already opened chunk readers.

By moving the logic from the local datastore cache to a helper method
on the chunk store, it is also assured that the operation is guarded
by the chunk store mutex lock to avoid races with chunk re-insert.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 pbs-datastore/src/chunk_store.rs              | 20 +++++++++++++++
 .../src/local_datastore_lru_cache.rs          | 25 +++----------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs
index dc247886a..6e50327cb 100644
--- a/pbs-datastore/src/chunk_store.rs
+++ b/pbs-datastore/src/chunk_store.rs
@@ -658,6 +658,26 @@ impl ChunkStore {
         (chunk_path, digest_str)
     }
 
+    /// 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.
+    pub fn clear_chunk(&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() {
+            let uid = pbs_config::backup_user()?.uid;
+            let gid = pbs_config::backup_group()?.gid;
+            create_options = create_options.owner(uid).group(gid);
+        }
+
+        let _lock = self.mutex.lock();
+
+        proxmox_sys::fs::replace_file(&chunk_path, &[], create_options, false)
+            .map_err(|err| format_err!("clear chunk failed for {digest_str} - {err}"))?;
+        Ok(())
+    }
+
     pub fn relative_path(&self, path: &Path) -> PathBuf {
         // unwrap: only `None` in unit tests
         assert!(self.locker.is_some());
diff --git a/pbs-datastore/src/local_datastore_lru_cache.rs b/pbs-datastore/src/local_datastore_lru_cache.rs
index 12b7f0aaa..fe0b336ff 100644
--- a/pbs-datastore/src/local_datastore_lru_cache.rs
+++ b/pbs-datastore/src/local_datastore_lru_cache.rs
@@ -71,17 +71,8 @@ impl LocalDatastoreLruCache {
     /// Fails if the chunk cannot be inserted successfully.
     pub fn insert(&self, digest: &[u8; 32], chunk: &DataBlob) -> Result<(), Error> {
         self.store.insert_chunk(chunk, digest)?;
-        self.cache.insert(*digest, (), |digest| {
-            let (path, _digest_str) = self.store.chunk_path(&digest);
-            // Truncate to free up space but keep the inode around, since that
-            // is used as marker for chunks in use by garbage collection.
-            if let Err(err) = nix::unistd::truncate(&path, 0) {
-                if err != nix::errno::Errno::ENOENT {
-                    return Err(Error::from(err));
-                }
-            }
-            Ok(())
-        })
+        self.cache
+            .insert(*digest, (), |digest| self.store.clear_chunk(&digest))
     }
 
     /// Remove a chunk from the local datastore cache.
@@ -113,17 +104,7 @@ impl LocalDatastoreLruCache {
     ) -> Result<Option<DataBlob>, Error> {
         if self
             .cache
-            .access(*digest, cacher, |digest| {
-                let (path, _digest_str) = self.store.chunk_path(&digest);
-                // Truncate to free up space but keep the inode around, since that
-                // is used as marker for chunks in use by garbage collection.
-                if let Err(err) = nix::unistd::truncate(&path, 0) {
-                    if err != nix::errno::Errno::ENOENT {
-                        return Err(Error::from(err));
-                    }
-                }
-                Ok(())
-            })
+            .access(*digest, cacher, |digest| self.store.clear_chunk(&digest))
             .await?
             .is_some()
         {
-- 
2.47.3



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