From 58e486ae949c0a1c456b711c2d877b12bb36a3d1 Mon Sep 17 00:00:00 2001
From: Ron Kuris <ron.kuris@avalabs.org>
Date: Thu, 27 Apr 2023 14:23:28 +0000
Subject: [PATCH] 2/3: Postpone cloning the db_path

Want access to it after the last init_wal for better errors
---
 firewood/src/db.rs             |  2 +-
 firewood/src/storage/buffer.rs | 29 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/firewood/src/db.rs b/firewood/src/db.rs
index 36e83d874..abe2dafbb 100644
--- a/firewood/src/db.rs
+++ b/firewood/src/db.rs
@@ -604,7 +604,7 @@ impl Db<CompactSpace<Node, StoreRevMut>> {
         });
 
         // recover from Wal
-        disk_requester.init_wal("wal", db_path);
+        disk_requester.init_wal("wal", &db_path);
 
         let root_hash_staging = StoreRevMut::new(root_hash_cache);
         let (data_staging, mut latest) = Db::new_store(&data_cache, reset, offset, cfg, &params)?;
diff --git a/firewood/src/storage/buffer.rs b/firewood/src/storage/buffer.rs
index 3e1f1b507..9211c1b56 100644
--- a/firewood/src/storage/buffer.rs
+++ b/firewood/src/storage/buffer.rs
@@ -1,4 +1,11 @@
 //! Disk buffer for staging in memory pages and flushing them to disk.
+use std::fmt::Debug;
+use std::ops::IndexMut;
+use std::path::{Path, PathBuf};
+use std::rc::Rc;
+use std::sync::Arc;
+use std::{cell::RefCell, collections::HashMap};
+
 use super::{AshRecord, FilePool, Page, StoreDelta, StoreError, WalConfig, PAGE_SIZE_NBIT};
 use crate::storage::DeltaPage;
 use aiofut::{AioBuilder, AioError, AioManager};
@@ -9,15 +16,6 @@ use growthring::{
     WalFileImpl, WalStoreImpl,
 };
 use shale::SpaceId;
-use std::{
-    cell::RefCell,
-    collections::HashMap,
-    fmt::Debug,
-    ops::IndexMut,
-    path::{Path, PathBuf},
-    rc::Rc,
-    sync::Arc,
-};
 use tokio::{
     sync::{
         mpsc,
@@ -581,9 +579,12 @@ impl DiskBufferRequester {
     }
 
     /// Initialize the Wal.
-    pub fn init_wal(&self, waldir: &str, rootpath: PathBuf) {
+    pub fn init_wal(&self, waldir: &str, rootpath: &Path) {
         self.sender
-            .blocking_send(BufferCmd::InitWal(rootpath, waldir.to_string()))
+            .blocking_send(BufferCmd::InitWal(
+                rootpath.to_path_buf(),
+                waldir.to_string(),
+            ))
             .map_err(StoreError::Send)
             .ok();
     }
@@ -645,7 +646,7 @@ mod tests {
         let state_path = file::touch_dir("state", &root_db_path).unwrap();
         assert!(reset);
         // create a new wal directory on top of root_db_fd
-        disk_requester.init_wal("wal", root_db_path);
+        disk_requester.init_wal("wal", &root_db_path);
 
         // create a new state cache which tracks on disk state.
         let state_cache = Arc::new(
@@ -733,7 +734,7 @@ mod tests {
         let state_path = file::touch_dir("state", &root_db_path).unwrap();
         assert!(reset);
         // create a new wal directory on top of root_db_fd
-        disk_requester.init_wal("wal", root_db_path);
+        disk_requester.init_wal("wal", &root_db_path);
 
         // create a new state cache which tracks on disk state.
         let state_cache = Arc::new(
@@ -817,7 +818,7 @@ mod tests {
         let state_path = file::touch_dir("state", &root_db_path).unwrap();
         assert!(reset);
         // create a new wal directory on top of root_db_fd
-        disk_requester.init_wal("wal", root_db_path);
+        disk_requester.init_wal("wal", &root_db_path);
 
         // create a new state cache which tracks on disk state.
         let state_cache = Arc::new(