Merge pull request #171 from fjall-rs/journal-recovery-log

add better logging to journal recovery ParseInt error

Author: marvin-j97

Cargo.toml

@@ -2,7 +2,7 @@
 name = "fjall"
 description = "Log-structured, embeddable key-value storage engine"
 license = "MIT OR Apache-2.0"
-version = "2.11.0"
+version = "2.11.1"
 edition = "2021"
 rust-version = "1.76.0"
 readme = "README.md"
@@ -28,7 +28,7 @@ __internal_whitebox = []
 [dependencies]
 byteorder = "1.5.0"
 byteview = "0.6.1"
-lsm-tree = { version = "~2.10", default-features = false, features = [] }
+lsm-tree = { version = "~2.10.1", default-features = false, features = [] }
 log = "0.4.21"
 std-semaphore = "0.1.0"
 tempfile = "3.10.1"

src/journal/recovery.rs

@@ -21,8 +21,6 @@ pub fn recover_journals<P: AsRef<Path>>(path: P) -> crate::Result<RecoveryResult
     let mut max_journal_id: JournalId = 0;
     let mut journal_fragments = Vec::<(JournalId, PathBuf)>::new();
 
-    log::warn!("{journal_fragments:?}");
-
     for dirent in std::fs::read_dir(path)? {
         let dirent = dirent?;
         let path = dirent.path();
@@ -40,7 +38,10 @@ pub fn recover_journals<P: AsRef<Path>>(path: P) -> crate::Result<RecoveryResult
             .strip_suffix(".sealed") // TODO: 3.0.0 remove in V3
             .unwrap_or(filename)
             .parse::<JournalId>()
-            .expect("should be valid journal ID");
+            .inspect_err(|e| {
+                log::error!("found an invalid journal file name {filename:?}: {e:?}");
+            })
+            .expect("should be a valid journal file name");
 
         max_journal_id = max_journal_id.max(journal_id);
 
@@ -50,6 +51,8 @@ pub fn recover_journals<P: AsRef<Path>>(path: P) -> crate::Result<RecoveryResult
     // NOTE: Sort ascending, so the last item is the active journal
     journal_fragments.sort_by(|(a, _), (b, _)| a.cmp(b));
 
+    log::trace!("Recovered {journal_fragments:#?}");
+
     Ok(match journal_fragments.pop() {
         Some((_, active)) => RecoveryResult {
             active: Journal::from_file(active)?,