change default values for Event DB timeouts (#3341)

Author: Mr-Leshiy

catalyst-gateway/bin/src/db/event/mod.rs

@@ -336,12 +336,15 @@ pub fn establish_connection_pool() {
     }
 
     let pg_mgr = deadpool_postgres::Manager::new(config, tokio_postgres::NoTls);
-
     match deadpool::managed::Pool::builder(pg_mgr)
         .max_size(Settings::event_db_settings().max_connections() as usize)
-        .create_timeout(Settings::event_db_settings().connection_creation_timeout())
-        .wait_timeout(Settings::event_db_settings().slot_wait_timeout())
-        .recycle_timeout(Settings::event_db_settings().connection_recycle_timeout())
+        .create_timeout(Some(
+            Settings::event_db_settings().connection_creation_timeout(),
+        ))
+        .wait_timeout(Some(Settings::event_db_settings().slot_wait_timeout()))
+        .recycle_timeout(Some(
+            Settings::event_db_settings().connection_recycle_timeout(),
+        ))
         .runtime(deadpool::Runtime::Tokio1)
         .build()
     {

catalyst-gateway/bin/src/settings/event_db.rs

@@ -4,9 +4,17 @@ use std::time::Duration;
 
 use super::str_env_var::StringEnvVar;
 
-/// Sets the maximum number of connections managed by the pool.
-/// Defaults to 100.
-const EVENT_DB_MAX_CONNECTIONS: u32 = 100;
+/// Default the maximum number of connections managed by the pool.
+const EVENT_DB_MAX_CONNECTIONS_DEFAULT: u32 = 100;
+
+/// Default the timeout when creating a new connection.
+const EVENT_DB_CONN_TIMEOUT_DEFAULT: Duration = Duration::from_secs(5);
+
+/// Default the timeout for waiting for a slot to become available.
+const EVENT_DB_SLOT_WAIT_TIMEOUT_DEFAULT: Duration = Duration::from_secs(5);
+
+/// Default the timeout when for recycling a connection.
+const EVENT_DB_CONN_RECYCLE_TIMEOUT_DEFAULT: Duration = Duration::from_secs(5);
 
 /// Default Event DB URL.
 const EVENT_DB_URL_DEFAULT: &str =
@@ -29,13 +37,16 @@ pub(crate) struct EnvVars {
     max_connections: u32,
 
     /// Sets the timeout when creating a new connection.
-    connection_creation_timeout: Option<Duration>,
+    /// Defaults to 5 seconds.
+    connection_creation_timeout: Duration,
 
     /// Sets the timeout for waiting for a slot to become available.
-    slot_wait_timeout: Option<Duration>,
+    /// Defaults to 5 seconds.
+    slot_wait_timeout: Duration,
 
     /// Sets the timeout when for recycling a connection.
-    connection_recycle_timeout: Option<Duration>,
+    /// Defaults to 5 seconds.
+    connection_recycle_timeout: Duration,
 }
 
 impl EnvVars {
@@ -47,16 +58,21 @@ impl EnvVars {
             password: StringEnvVar::new_optional("EVENT_DB_PASSWORD", true),
             max_connections: StringEnvVar::new_as_int(
                 "EVENT_DB_MAX_CONNECTIONS",
-                EVENT_DB_MAX_CONNECTIONS,
+                EVENT_DB_MAX_CONNECTIONS_DEFAULT,
                 0,
                 u32::MAX,
             ),
-            connection_creation_timeout: StringEnvVar::new_as_duration_optional(
+            connection_creation_timeout: StringEnvVar::new_as_duration(
                 "EVENT_DB_CONN_TIMEOUT",
+                EVENT_DB_CONN_TIMEOUT_DEFAULT,
+            ),
+            slot_wait_timeout: StringEnvVar::new_as_duration(
+                "EVENT_DB_SLOT_WAIT_TIMEOUT",
+                EVENT_DB_SLOT_WAIT_TIMEOUT_DEFAULT,
             ),
-            slot_wait_timeout: StringEnvVar::new_as_duration_optional("EVENT_DB_SLOT_WAIT_TIMEOUT"),
-            connection_recycle_timeout: StringEnvVar::new_as_duration_optional(
+            connection_recycle_timeout: StringEnvVar::new_as_duration(
                 "EVENT_DB_CONN_RECYCLE_TIMEOUT",
+                EVENT_DB_CONN_RECYCLE_TIMEOUT_DEFAULT,
             ),
         }
     }
@@ -82,17 +98,17 @@ impl EnvVars {
     }
 
     /// Returns Event DB `connection_creation_timeout` setting
-    pub(crate) fn connection_creation_timeout(&self) -> Option<Duration> {
+    pub(crate) fn connection_creation_timeout(&self) -> Duration {
         self.connection_creation_timeout
     }
 
     /// Returns Event DB `slot_wait_timeout` setting
-    pub(crate) fn slot_wait_timeout(&self) -> Option<Duration> {
+    pub(crate) fn slot_wait_timeout(&self) -> Duration {
         self.slot_wait_timeout
     }
 
     /// Returns Event DB `connection_recycle_timeout` setting
-    pub(crate) fn connection_recycle_timeout(&self) -> Option<Duration> {
+    pub(crate) fn connection_recycle_timeout(&self) -> Duration {
         self.connection_recycle_timeout
     }
 }

catalyst-gateway/bin/src/settings/str_env_var.rs

@@ -210,25 +210,6 @@ impl StringEnvVar {
             .into()
     }
 
-    /// Convert an Envvar into the required Duration type.
-    pub(crate) fn new_as_duration_optional(var_name: &str) -> Option<Duration> {
-        let choices = "A value in the format of `[0-9]+(ns|us|ms|[smhdwy])`";
-
-        let raw_value = Self::new_optional(var_name, false)?.as_string();
-
-        DurationString::try_from(raw_value.clone())
-            .inspect_err(|err| {
-                error!(
-                    error = ?err,
-                    choices=choices,
-                    duration_str = raw_value,
-                    "Invalid Duration string. Defaulting to None",
-                );
-            })
-            .map(Into::into)
-            .ok()
-    }
-
     /// Convert an Envvar into an integer in the bounded range.
     pub(super) fn new_as_int<T>(
         var_name: &str,