Merge branch 'next' into non-persist

bytebeamio · May 1, 2023 · 0f8786d · 0f8786d
2 parents 5093f9e + 0e86050
commit 0f8786d
Show file tree

Hide file tree

Showing 23 changed files with 1,266 additions and 115 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,9 +7,10 @@ members = [
     "disk",
 ]
 exclude = [
+    "tools/deserialize-backup",
+    "tools/simulator",
     "tools/tunshell",
     "tools/utils",
-    "tools/simulator",
 ]
 
 [profile.dev]

diff --git a/disk/src/lib.rs b/disk/src/lib.rs
@@ -32,6 +32,8 @@ pub struct Storage {
     current_read_file: BytesMut,
     /// id of file being read, delete it on read completion
     current_read_file_id: Option<u64>,
+    /// run through persistence without deleting files
+    pub non_destructive_read: bool,
 }
 
 impl Storage {
@@ -52,6 +54,7 @@ impl Storage {
             current_write_file: BytesMut::with_capacity(max_file_size * 2),
             current_read_file: BytesMut::with_capacity(max_file_size * 2),
             current_read_file_id: None,
+            non_destructive_read: false,
         })
     }
 
@@ -77,8 +80,13 @@ impl Storage {
 
     /// Removes a file with provided id
     fn remove(&self, id: u64) -> Result<(), Error> {
+        if self.non_destructive_read {
+            return Ok(());
+        }
+
         let path = self.get_read_file_path(id)?;
         fs::remove_file(path)?;
+
         Ok(())
     }