allow setting max db size on namespace create

Author: MarinPostma

sqld/src/connection/config.rs

@@ -5,7 +5,7 @@ use std::sync::Arc;
 use std::{fs, io};
 
 use crate::error::Error;
-use crate::Result;
+use crate::{Result, LIBSQL_PAGE_SIZE};
 
 #[derive(Debug)]
 pub struct DatabaseConfigStore {
@@ -29,7 +29,7 @@ pub struct DatabaseConfig {
 }
 
 const fn default_max_size() -> u64 {
-    bytesize::ByteSize::pb(1000).as_u64() / 4096
+    bytesize::ByteSize::pb(1000).as_u64() / LIBSQL_PAGE_SIZE
 }
 
 impl Default for DatabaseConfig {

sqld/src/http/admin/mod.rs

@@ -12,10 +12,10 @@ use tokio_util::io::ReaderStream;
 use url::Url;
 
 use crate::database::Database;
-use crate::LIBSQL_PAGE_SIZE;
 use crate::error::LoadDumpError;
 use crate::hrana;
 use crate::namespace::{DumpStream, MakeNamespace, NamespaceName, NamespaceStore, RestoreOption};
+use crate::LIBSQL_PAGE_SIZE;
 
 pub mod stats;
 
@@ -127,11 +127,6 @@ struct HttpDatabaseConfig {
     max_db_size: Option<bytesize::ByteSize>,
 }
 
-#[derive(Debug, Deserialize)]
-struct CreateNamespaceReq {
-    dump_url: Option<Url>,
-}
-
 async fn handle_post_config<M: MakeNamespace>(
     State(app_state): State<Arc<AppState<M>>>,
     Path(namespace): Path<String>,
@@ -154,6 +149,12 @@ async fn handle_post_config<M: MakeNamespace>(
     Ok(())
 }
 
+#[derive(Debug, Deserialize)]
+struct CreateNamespaceReq {
+    dump_url: Option<Url>,
+    max_db_size: Option<bytesize::ByteSize>,
+}
+
 async fn handle_create_namespace<M: MakeNamespace>(
     State(app_state): State<Arc<AppState<M>>>,
     Path(namespace): Path<String>,
@@ -164,10 +165,16 @@ async fn handle_create_namespace<M: MakeNamespace>(
         None => RestoreOption::Latest,
     };
 
-    app_state
-        .namespaces
-        .create(NamespaceName::from_string(namespace)?, dump)
-        .await?;
+    let namespace = NamespaceName::from_string(namespace)?;
+    app_state.namespaces.create(namespace.clone(), dump).await?;
+
+    if let Some(max_db_size) = req.max_db_size {
+        let store = app_state.namespaces.config_store(namespace).await?;
+        let mut config = (*store.get()).clone();
+        config.max_db_pages = max_db_size.as_u64() / LIBSQL_PAGE_SIZE;
+        store.store(config)?;
+    }
+
     Ok(())
 }
 

sqld/src/namespace/mod.rs

@@ -728,7 +728,7 @@ impl Namespace<PrimaryDatabase> {
         .await?;
 
         let db_config_store = Arc::new(
-            dbg!(DatabaseConfigStore::load(&db_path)).context("Could not load database config")?,
+            DatabaseConfigStore::load(&db_path).context("Could not load database config")?,
         );
 
         let connection_maker: Arc<_> = MakeLibSqlConn::new(

sqld/src/replication/primary/logger.rs

@@ -859,14 +859,14 @@ impl ReplicationLogger {
         let data_file = File::open(&data_path)?;
         let size = data_path.metadata()?.len();
         assert!(
-            size % LIBSQL_PAGE_SIZE as u64 == 0,
+            size % LIBSQL_PAGE_SIZE == 0,
             "database file size is not a multiple of page size"
         );
         let num_page = size / LIBSQL_PAGE_SIZE;
         let mut buf = [0; LIBSQL_PAGE_SIZE as usize];
         let mut page_no = 1; // page numbering starts at 1
         for i in 0..num_page {
-            data_file.read_exact_at(&mut buf, i * LIBSQL_PAGE_SIZE as u64)?;
+            data_file.read_exact_at(&mut buf, i * LIBSQL_PAGE_SIZE)?;
             log_file.push_page(&WalPage {
                 page_no,
                 size_after: if i == num_page - 1 { num_page as _ } else { 0 },