migrate web::releases to sqlx

Author: syphar

.sqlx/query-340670c2844a0e5df3b5384a8c3a92c3ad35bd1484a6ef9fa02d508f65c7c3ec.json

@@ -13,6 +13,7 @@ pub struct Config {
 
     // Database connection params
     pub(crate) database_url: String,
+    pub(crate) max_legacy_pool_size: u32,
     pub(crate) max_pool_size: u32,
     pub(crate) min_pool_idle: u32,
 
@@ -148,7 +149,8 @@ impl Config {
             prefix: prefix.clone(),
 
             database_url: require_env("DOCSRS_DATABASE_URL")?,
-            max_pool_size: env("DOCSRS_MAX_POOL_SIZE", 90)?,
+            max_legacy_pool_size: env("DOCSRS_MAX_LEGACY_POOL_SIZE", 45)?,
+            max_pool_size: env("DOCSRS_MAX_POOL_SIZE", 45)?,
             min_pool_idle: env("DOCSRS_MIN_POOL_IDLE", 10)?,
 
             storage_backend: env("DOCSRS_STORAGE_BACKEND", StorageKind::Database)?,

.sqlx/query-545ccf8362ae92d921df5da730c10e24ddda6f411a0f5c9461f8ee5f6231c5b4.json

@@ -9,7 +9,7 @@ pub use self::{
     file::{add_path_into_database, add_path_into_remote_archive},
     migrate::migrate,
     overrides::Overrides,
-    pool::{Pool, PoolClient, PoolError},
+    pool::{AsyncPoolClient, Pool, PoolClient, PoolError},
 };
 
 mod add_package;

.sqlx/query-bdddad099e891bb45ba3703d7144160056d6cb620c55be459ead0f95c3523035.json

@@ -4,7 +4,7 @@ use futures_util::{future::BoxFuture, stream::BoxStream};
 use postgres::{Client, NoTls};
 use r2d2_postgres::PostgresConnectionManager;
 use sqlx::{postgres::PgPoolOptions, Executor};
-use std::sync::Arc;
+use std::{sync::Arc, time::Duration};
 use tokio::runtime::Runtime;
 use tracing::debug;
 
@@ -56,22 +56,29 @@ impl Pool {
             .database_url
             .parse()
             .map_err(PoolError::InvalidDatabaseUrl)?;
+
+        let acquire_timeout = Duration::from_secs(30);
+        let max_lifetime = Duration::from_secs(30 * 60);
+        let idle_timeout = Duration::from_secs(10 * 60);
+
         let manager = PostgresConnectionManager::new(url, NoTls);
         let pool = r2d2::Pool::builder()
-            .max_size(config.max_pool_size)
+            .max_size(config.max_legacy_pool_size)
             .min_idle(Some(config.min_pool_idle))
+            .max_lifetime(Some(max_lifetime))
+            .connection_timeout(acquire_timeout)
+            .idle_timeout(Some(idle_timeout))
             .connection_customizer(Box::new(SetSchema::new(schema)))
             .build(manager)
             .map_err(PoolError::PoolCreationFailed)?;
 
         let _guard = runtime.enter();
         let async_pool = PgPoolOptions::new()
-            // FIXME: these pool sizes would have to be validated before the pool is used in
-            // a production setting.
-            // Currently we only use it for the storage DB backend, which is only used for local
-            // & unit-testing.
             .max_connections(config.max_pool_size)
-            // .min_connections(config.min_pool_idle)
+            .min_connections(config.min_pool_idle)
+            .max_lifetime(max_lifetime)
+            .acquire_timeout(acquire_timeout)
+            .idle_timeout(idle_timeout)
             .after_connect({
                 let schema = schema.to_owned();
                 move |conn, _meta| {
@@ -102,7 +109,7 @@ impl Pool {
             pool,
             async_pool,
             metrics,
-            max_size: config.max_pool_size,
+            max_size: config.max_legacy_pool_size + config.max_pool_size,
         })
     }
 

src/config.rs

@@ -2,7 +2,7 @@ mod fakes;
 
 pub(crate) use self::fakes::FakeBuild;
 use crate::cdn::CdnBackend;
-use crate::db::{Pool, PoolClient};
+use crate::db::{AsyncPoolClient, Pool, PoolClient};
 use crate::error::Result;
 use crate::repositories::RepositoryStatsUpdater;
 use crate::storage::{AsyncStorage, Storage, StorageKind};
@@ -298,6 +298,7 @@ impl TestEnvironment {
 
         // Use less connections for each test compared to production.
         config.max_pool_size = 4;
+        config.max_legacy_pool_size = 4;
         config.min_pool_idle = 0;
 
         // Use the database for storage, as it's faster than S3.
@@ -571,6 +572,13 @@ impl TestDatabase {
         self.pool.clone()
     }
 
+    pub(crate) async fn async_conn(&self) -> AsyncPoolClient {
+        self.pool
+            .get_async()
+            .await
+            .expect("failed to get a connection out of the pool")
+    }
+
     pub(crate) fn conn(&self) -> PoolClient {
         self.pool
             .get()