Expose connection pool's get timeout via ConnectionOptionsBuilder

gremlin-client/src/aio/client.rs

@@ -8,7 +8,7 @@
 use crate::GValue;
 use crate::ToGValue;
 use crate::{ConnectionOptions, GremlinError, GremlinResult};
 use base64::encode;
 use futures::future::{BoxFuture, FutureExt};
 use mobc::{Connection, Pool};
 use serde::Serialize;
@@ -56,7 +56,10 @@
         let pool_size = opts.pool_size;
         let manager = GremlinConnectionManager::new(opts.clone());
 
-        let pool = Pool::builder().max_open(pool_size as u64).build(manager);
+        let pool = Pool::builder()
+            .get_timeout(opts.pool_get_connection_timeout)
+            .max_open(pool_size as u64)
+            .build(manager);
 
         Ok(GremlinClient {
             pool,
@@ -176,7 +179,7 @@
 
                         args.insert(
                             String::from("sasl"),
                             GValue::String(encode(&format!("\0{}\0{}", c.username, c.password))),
                         );
 
                         let args = self.options.serializer.write(&GValue::from(args))?;

gremlin-client/src/client.rs

@@ -7,7 +7,7 @@
 use crate::ToGValue;
 use crate::{ConnectionOptions, GremlinError, GremlinResult};
 use crate::{GResultSet, GValue};
 use base64::encode;
 use r2d2::Pool;
 use serde::Serialize;
 use std::collections::{HashMap, VecDeque};
@@ -54,10 +54,14 @@
         let pool_size = opts.pool_size;
         let manager = GremlinConnectionManager::new(opts.clone());
 
-        let pool = Pool::builder().max_size(pool_size).build(manager)?;
+        let mut pool_builder = Pool::builder().max_size(pool_size);
+
+        if let Some(get_connection_timeout) = opts.pool_get_connection_timeout {
+            pool_builder = pool_builder.connection_timeout(get_connection_timeout);
+        }
 
         Ok(GremlinClient {
-            pool,
+            pool: pool_builder.build(manager)?,
             session: None,
             alias: None,
             options: opts,
@@ -234,7 +238,7 @@
 
                     args.insert(
                         String::from("sasl"),
                         GValue::String(encode(&format!("\0{}\0{}", c.username, c.password))),
                     );
 
                     let args = self.options.serializer.write(&GValue::from(args))?;

gremlin-client/src/connection.rs

@@ -1,4 +1,4 @@
-use std::net::TcpStream;
+use std::{net::TcpStream, time::Duration};
 
 use crate::{GraphSON, GremlinError, GremlinResult};
 use native_tls::TlsConnector;
@@ -62,7 +62,7 @@
 
     fn send(&mut self, payload: Vec<u8>) -> GremlinResult<()> {
         self.0
             .write_message(Message::Binary(payload))
             .map_err(GremlinError::from)
     }
 
@@ -120,6 +120,13 @@
         self
     }
 
+    /// Both the sync and async pool providers use a default of 30 seconds,
+    /// Async pool interprets `None` as no timeout. Sync pool maps `None` to the default value
+    pub fn pool_connection_timeout(mut self, pool_connection_timeout: Option<Duration>) -> Self {
+        self.0.pool_get_connection_timeout = pool_connection_timeout;
+        self
+    }
+
     pub fn build(self) -> ConnectionOptions {
         self.0
     }
@@ -163,6 +170,7 @@
     pub(crate) host: String,
     pub(crate) port: u16,
     pub(crate) pool_size: u32,
+    pub(crate) pool_get_connection_timeout: Option<Duration>,
     pub(crate) credentials: Option<Credentials>,
     pub(crate) ssl: bool,
     pub(crate) tls_options: Option<TlsOptions>,
@@ -245,6 +253,7 @@
             host: String::from("localhost"),
             port: 8182,
             pool_size: 10,
+            pool_get_connection_timeout: Some(Duration::from_secs(30)),
             credentials: None,
             ssl: false,
             tls_options: None,