Merge pull request #1869 from tursodatabase/lucio/try-pull-err

libsql: Clean up error handling in try_pull
tursodatabase · Dec 6, 2024 · 105748d · 105748d
2 parents 223c853 + 019c2ce
commit 105748d
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/libsql/src/local/database.rs b/libsql/src/local/database.rs
@@ -471,25 +471,33 @@ impl Database {
         let mut frame_no = sync_ctx.durable_frame_num() + 1;
         let conn = self.connect()?;
         conn.wal_insert_begin()?;
+
+        let mut err = None;
+
         loop {
             match sync_ctx.pull_one_frame(generation, frame_no).await {
                 Ok(frame) => {
                     conn.wal_insert_frame(&frame)?;
                     frame_no += 1;
                 }
                 Err(e) => {
-                    println!("pull_one_frame error: {:?}", e);
+                    tracing::debug!("pull_one_frame error: {:?}", e);
+                    err.replace(e);
                     break;
                 }
             }
-
         }
         conn.wal_insert_end()?;
         sync_ctx.write_metadata().await?;
-        Ok(crate::database::Replicated {
-            frame_no: None,
-            frames_synced: 1,
-        })
+
+        if let Some(err) = err {
+            Err(err)
+        } else {
+            Ok(crate::database::Replicated {
+                frame_no: None,
+                frames_synced: 1,
+            })
+        }
     }
 
     pub(crate) fn path(&self) -> &str {