Merge pull request #151 from muzarski/default_client_request_timeout

cluster: global request client timeout

Author: wprzytula

scylla-rust-wrapper/src/cluster.rs

@@ -26,6 +26,12 @@ use std::time::Duration;
 
 include!(concat!(env!("OUT_DIR"), "/cppdriver_compression_types.rs"));
 
+// According to `cassandra.h` the default CPP driver's
+// - consistency for statements is LOCAL_ONE,
+// - request client timeout is 12000 millis.
+const DEFAULT_CONSISTENCY: Consistency = Consistency::LocalOne;
+const DEFAULT_REQUEST_TIMEOUT_MILLIS: u64 = 12000;
+
 #[derive(Clone, Debug)]
 pub(crate) struct LoadBalancingConfig {
     pub(crate) token_awareness_enabled: bool,
@@ -115,9 +121,9 @@ pub fn build_session_builder(
 
 #[no_mangle]
 pub unsafe extern "C" fn cass_cluster_new() -> *mut CassCluster {
-    // According to `cassandra.h` the default CPP driver's consistency for statements is LOCAL_ONE.
-    let default_execution_profile_builder =
-        ExecutionProfileBuilder::default().consistency(Consistency::LocalOne);
+    let default_execution_profile_builder = ExecutionProfileBuilder::default()
+        .consistency(DEFAULT_CONSISTENCY)
+        .request_timeout(Some(Duration::from_millis(DEFAULT_REQUEST_TIMEOUT_MILLIS)));
 
     Box::into_raw(Box::new(CassCluster {
         session_builder: SessionBuilder::new(),
@@ -224,6 +230,19 @@ pub unsafe extern "C" fn cass_cluster_set_connect_timeout(
     cluster.session_builder.config.connect_timeout = Duration::from_millis(timeout_ms.into());
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn cass_cluster_set_request_timeout(
+    cluster_raw: *mut CassCluster,
+    timeout_ms: c_uint,
+) {
+    let cluster = ptr_to_ref_mut(cluster_raw);
+
+    exec_profile_builder_modify(&mut cluster.default_execution_profile_builder, |builder| {
+        // 0 -> no timeout
+        builder.request_timeout((timeout_ms > 0).then(|| Duration::from_millis(timeout_ms.into())))
+    })
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn cass_cluster_set_port(
     cluster_raw: *mut CassCluster,

src/testing_unimplemented.cpp

@@ -131,11 +131,6 @@ cass_cluster_set_prepare_on_up_or_add_host(CassCluster* cluster,
 	throw std::runtime_error("UNIMPLEMENTED cass_cluster_set_prepare_on_up_or_add_host\n");
 }
 CASS_EXPORT void
-cass_cluster_set_request_timeout(CassCluster* cluster,
-                                 unsigned timeout_ms){
-	throw std::runtime_error("UNIMPLEMENTED cass_cluster_set_request_timeout\n");
-}
-CASS_EXPORT void
 cass_cluster_set_retry_policy(CassCluster* cluster,
                               CassRetryPolicy* retry_policy){
 	throw std::runtime_error("UNIMPLEMENTED cass_cluster_set_retry_policy\n");