Merge pull request #288 from shachlanAmazon/use-fork

Use fork with connection timeout.
valkey-io · Jun 22, 2023 · c144135 · c144135
2 parents b60111d + 0cc8e43
commit c144135
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/babushka-core/src/client/mod.rs b/babushka-core/src/client/mod.rs
@@ -20,6 +20,7 @@ impl BabushkaClient for Client {}
 
 pub const DEFAULT_RESPONSE_TIMEOUT: Duration = Duration::from_millis(250);
 pub const DEFAULT_CONNECTION_ATTEMPT_TIMEOUT: Duration = Duration::from_millis(250);
+pub const INTERNAL_CONNECTION_TIMEOUT: Duration = Duration::from_millis(250);
 
 pub(super) fn get_port(address: &AddressInfo) -> u16 {
     const DEFAULT_PORT: u16 = 6379;
@@ -159,7 +160,8 @@ async fn create_cluster_client(
         .into_iter()
         .map(|address| get_connection_info(&address, tls_mode, redis_connection_info.clone()))
         .collect();
-    let mut builder = redis::cluster::ClusterClientBuilder::new(initial_nodes);
+    let mut builder = redis::cluster::ClusterClientBuilder::new(initial_nodes)
+        .connection_timeout(INTERNAL_CONNECTION_TIMEOUT);
     if tls_mode != TlsMode::NoTls {
         let tls = if tls_mode == TlsMode::SecureTls {
             redis::cluster::TlsMode::Secure

diff --git a/submodules/redis-rs b/submodules/redis-rs