chore: always checkpoint before shutdown

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

.cargo/config.toml

@@ -2,7 +2,3 @@
 
 [target.x86_64-unknown-linux-musl]
 rustflags=["-C", "target_cpu=x86-64-v2"]
-
-[env]
-DUCKDB_STATIC="1"
-DUCKDB_EXTENSIONS="core_functions"

Cargo.lock

@@ -16,7 +16,7 @@ path="src/main.rs"
 
 [dependencies]
 # async/concurrency
-tokio={version="1.44", default-features=false, features=["macros", "rt-multi-thread"]}
+tokio={version="1.44", default-features=false, features=["macros", "rt-multi-thread", "signal"]}
 tokio-util={version="0.7", features=["io"]}
 futures-lite="2.6"
 crossbeam-utils="0.8"
@@ -67,6 +67,7 @@ rustls={version="0.23", features=["aws_lc_rs"]}
 
 # database
 duckdb={git="https://github.com/explodingcamera-contrib/duckdb-rs", features=[
+    "buildtime_bindgen",
     "bundled",
     "time",
     "r2d2",

Cargo.toml

@@ -16,7 +16,8 @@ pub(super) fn init_duckdb(
     let mut flags = duckdb::Config::default()
         .enable_autoload_extension(true)?
         .access_mode(duckdb::AccessMode::ReadWrite)?
-        .with("enable_fsst_vectors", "true")?;
+        .with("enable_fsst_vectors", "true")?
+        .with("allocator_background_threads", "true")?;
 
     if let Some(duckdb_config) = duckdb_config {
         if let Some(memory_limit) = duckdb_config.memory_limit {
@@ -32,7 +33,7 @@ pub(super) fn init_duckdb(
     let pool = r2d2::Pool::new(conn)?;
     {
         let conn = pool.get()?;
-        conn.execute_batch("PRAGMA enable_checkpoint_on_shutdown;")?;
+        conn.execute("PRAGMA enable_checkpoint_on_shutdown", [])?;
         conn.pragma_update(None, "autoload_known_extensions", &"true")?;
         conn.pragma_update(None, "allow_community_extensions", &"false")?;
     }

src/app/db.rs

@@ -101,6 +101,12 @@ impl Liwan {
     pub fn run_background_tasks(&self) {
         core::geoip::keep_updated(self.geoip.clone());
     }
+
+    pub fn shutdown(&self) -> Result<()> {
+        self.events_pool.get()?.execute("FORCE CHECKPOINT", [])?; // normal checkpoints don't seem to work consistently on shutdown
+        tracing::info!("Shutting down");
+        Ok(())
+    }
 }
 
 #[cfg(any(debug_assertions, test, feature = "_enable_seeding"))]

src/app/mod.rs

@@ -22,9 +22,11 @@ async fn main() -> Result<()> {
     }
 
     let app = Liwan::try_new(config)?;
-
+    let app_copy = app.clone();
     app.run_background_tasks();
+
     tokio::select! {
+        _ = tokio::signal::ctrl_c() => app_copy.shutdown(),
         res = web::start_webserver(app.clone(), s) => res,
         res = tokio::task::spawn_blocking(move || app.clone().events.process(r)) => res?
     }