recovery panic fix (#1059)

* add missing config default * check dbs dir exist before restoring
tursodatabase · Feb 20, 2024 · 169f027 · 169f027
1 parent a8e5710
commit 169f027
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/libsql-server/src/connection/config.rs b/libsql-server/src/connection/config.rs
@@ -23,6 +23,7 @@ pub struct DatabaseConfig {
     pub txn_timeout: Option<Duration>,
     #[serde(default)]
     pub allow_attach: bool,
+    #[serde(default = "default_max_row_size")]
     pub max_row_size: u64,
     #[serde(default)]
     pub is_shared_schema: bool,

diff --git a/libsql-server/src/namespace/meta_store.rs b/libsql-server/src/namespace/meta_store.rs
@@ -152,9 +152,10 @@ impl MetaStoreInner {
 
         let txn = self.conn.transaction()?;
         // nothing in the meta store, check fs
-        if count == 0 {
+        let dbs_dir_path = base_path.join("dbs");
+        if count == 0 && dbs_dir_path.try_exists()? {
             tracing::info!("Recovering metastore from filesystem...");
-            let db_dir = read_dir(base_path.join("dbs"))?;
+            let db_dir = read_dir(&dbs_dir_path)?;
             for entry in db_dir {
                 let entry = entry?;
                 if !entry.path().is_dir() {