Merge pull request #1710 from tursodatabase/no-internal-connection-tracking

do not track internal connections

Author: MarinPostma

libsql-server/src/connection/mod.rs

@@ -314,6 +314,13 @@ impl<F> MakeThrottledConnection<F> {
             1
         }
     }
+
+    pub async fn untracked(&self) -> Result<F::Connection, Error>
+    where
+        F: MakeConnection,
+    {
+        self.connection_maker.create().await
+    }
 }
 
 struct WaitersGuard<'a> {

libsql-server/src/lib.rs

@@ -73,6 +73,7 @@ use utils::services::idle_shutdown::IdleShutdownKicker;
 use self::bottomless_migrate::bottomless_migrate;
 use self::config::MetaStoreConfig;
 use self::connection::connection_manager::InnerWalManager;
+use self::connection::MakeThrottledConnection;
 use self::namespace::configurator::{
     BaseNamespaceConfig, LibsqlPrimaryConfigurator, LibsqlReplicaConfigurator,
     LibsqlSchemaConfigurator, NamespaceConfigurators, PrimaryConfig, PrimaryConfigurator,
@@ -338,7 +339,7 @@ pub type SqldStorage =
 
 #[tracing::instrument(skip(connection_maker))]
 async fn run_periodic_checkpoint<C>(
-    connection_maker: Arc<C>,
+    connection_maker: Arc<MakeThrottledConnection<C>>,
     period: Duration,
     namespace_name: NamespaceName,
 ) -> anyhow::Result<()>
@@ -362,7 +363,7 @@ where
         } else {
             interval.tick().await;
         }
-        retry = match connection_maker.create().await {
+        retry = match connection_maker.untracked().await {
             Ok(conn) => {
                 if let Err(e) = conn.vacuum_if_needed().await {
                     tracing::warn!("vacuum failed: {}", e);

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

@@ -17,7 +17,7 @@ use tokio_util::io::StreamReader;
 use crate::connection::config::DatabaseConfig;
 use crate::connection::connection_manager::InnerWalManager;
 use crate::connection::legacy::MakeLegacyConnection;
-use crate::connection::{Connection as _, MakeConnection};
+use crate::connection::{Connection as _, MakeConnection, MakeThrottledConnection};
 use crate::database::{PrimaryConnection, PrimaryConnectionMaker};
 use crate::error::LoadDumpError;
 use crate::namespace::broadcasters::BroadcasterHandle;
@@ -380,7 +380,7 @@ pub(super) async fn make_stats(
 // right after checkpointing is exactly where it should be done.
 pub(crate) async fn run_storage_monitor<M: MakeConnection>(
     stats: Weak<Stats>,
-    connection_maker: Arc<M>,
+    connection_maker: Arc<MakeThrottledConnection<M>>,
 ) -> anyhow::Result<()> {
     // on initialization, the database file doesn't exist yet, so we wait a bit for it to be
     // created
@@ -392,7 +392,7 @@ pub(crate) async fn run_storage_monitor<M: MakeConnection>(
             return Ok(());
         };
 
-        match connection_maker.create().await {
+        match connection_maker.untracked().await {
             Ok(conn) => {
                 let _ = BLOCKING_RT
                     .spawn_blocking(move || {