cleanup libsql namespaces

Author: MarinPostma

libsql-server/src/namespace/configurator/libsql_primary.rs

@@ -25,6 +25,7 @@ use crate::schema::{has_pending_migration_task, setup_migration_table};
 use crate::stats::Stats;
 use crate::{SqldStorage, DB_CREATE_TIMEOUT, DEFAULT_AUTO_CHECKPOINT};
 
+use super::helpers::cleanup_libsql;
 use super::{BaseNamespaceConfig, ConfigureNamespace, PrimaryConfig};
 
 pub struct LibsqlPrimaryConfigurator {
@@ -248,12 +249,16 @@ impl ConfigureNamespace for LibsqlPrimaryConfigurator {
 
     fn cleanup<'a>(
         &'a self,
-        _namespace: &'a NamespaceName,
+        namespace: &'a NamespaceName,
         _db_config: &'a DatabaseConfig,
         _prune_all: bool,
         _bottomless_db_id_init: NamespaceBottomlessDbIdInit,
     ) -> Pin<Box<dyn Future<Output = crate::Result<()>> + Send + 'a>> {
-        unimplemented!()
+        Box::pin(cleanup_libsql(
+            namespace,
+            &self.registry,
+            &self.base.base_path,
+        ))
     }
 
     fn fork<'a>(

libsql-server/src/namespace/configurator/libsql_replica.rs

@@ -29,6 +29,7 @@ use crate::namespace::{
 };
 use crate::{SqldStorage, DB_CREATE_TIMEOUT};
 
+use super::helpers::cleanup_libsql;
 use super::{BaseNamespaceConfig, ConfigureNamespace};
 
 pub struct LibsqlReplicaConfigurator {
@@ -251,14 +252,11 @@ impl ConfigureNamespace for LibsqlReplicaConfigurator {
         _prune_all: bool,
         _bottomless_db_id_init: NamespaceBottomlessDbIdInit,
     ) -> Pin<Box<dyn Future<Output = crate::Result<()>> + Send + 'a>> {
-        Box::pin(async move {
-            let ns_path = self.base.base_path.join("dbs").join(namespace.as_str());
-            if ns_path.try_exists()? {
-                tracing::debug!("removing database directory: {}", ns_path.display());
-                tokio::fs::remove_dir_all(ns_path).await?;
-            }
-            Ok(())
-        })
+        Box::pin(cleanup_libsql(
+            namespace,
+            &self.registry,
+            &self.base.base_path,
+        ))
     }
 
     fn fork<'a>(

libsql-server/src/namespace/configurator/libsql_schema.rs

@@ -16,7 +16,7 @@ use crate::namespace::{
 use crate::schema::SchedulerHandle;
 use crate::SqldStorage;
 
-use super::helpers::cleanup_primary;
+use super::helpers::cleanup_libsql;
 use super::libsql_primary::{libsql_primary_common, LibsqlPrimaryCommon};
 use super::{BaseNamespaceConfig, ConfigureNamespace, PrimaryConfig};
 
@@ -146,21 +146,15 @@ impl ConfigureNamespace for LibsqlSchemaConfigurator {
     fn cleanup<'a>(
         &'a self,
         namespace: &'a NamespaceName,
-        db_config: &'a DatabaseConfig,
-        prune_all: bool,
-        bottomless_db_id_init: crate::namespace::NamespaceBottomlessDbIdInit,
+        _db_config: &'a DatabaseConfig,
+        _prune_all: bool,
+        _bottomless_db_id_init: crate::namespace::NamespaceBottomlessDbIdInit,
     ) -> std::pin::Pin<Box<dyn Future<Output = crate::Result<()>> + Send + 'a>> {
-        Box::pin(async move {
-            cleanup_primary(
-                &self.base,
-                &self.primary_config,
-                namespace,
-                db_config,
-                prune_all,
-                bottomless_db_id_init,
-            )
-            .await
-        })
+        Box::pin(cleanup_libsql(
+            namespace,
+            &self.registry,
+            &self.base.base_path,
+        ))
     }
 
     fn fork<'a>(