sqld: improve replica dump error handling

tursodatabase · Nov 22, 2024 · 2bf9d48 · 2bf9d48
1 parent 4a5f373
commit 2bf9d48
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/libsql-server/src/error.rs b/libsql-server/src/error.rs
@@ -128,6 +128,8 @@ pub enum Error {
     RuntimeTaskJoinError(#[from] tokio::task::JoinError),
     #[error("wal error: {0}")]
     LibsqlWal(#[from] libsql_wal::error::Error),
+    #[error("database is not a primary")]
+    NotAPrimary,
 }
 
 impl AsRef<Self> for Error {
@@ -224,6 +226,7 @@ impl IntoResponse for &Error {
             AttachInMigration => self.format_err(StatusCode::BAD_REQUEST),
             RuntimeTaskJoinError(_) => self.format_err(StatusCode::INTERNAL_SERVER_ERROR),
             LibsqlWal(_) => self.format_err(StatusCode::INTERNAL_SERVER_ERROR),
+            NotAPrimary => self.format_err(StatusCode::BAD_REQUEST),
         }
     }
 }

diff --git a/libsql-server/src/http/user/dump.rs b/libsql-server/src/http/user/dump.rs
@@ -98,11 +98,13 @@ pub(super) async fn handle_dump(
     let conn_maker = state
         .namespaces
         .with(namespace, |ns| {
-            assert!(ns.db.is_primary());
-            ns.db.connection_maker()
+            if !ns.db.is_primary() {
+                return Err(Error::NotAPrimary);
+            }
+
+            Ok::<_, crate::Error>(ns.db.connection_maker())
         })
-        .await
-        .unwrap();
+        .await??;
 
     let conn = conn_maker.create().await.unwrap();