new mongoc_client_update_sockettimeoutms()

so multiple pools are not necessary to accomodate different timeouts

Author: scotthunt

src/libmongoc/doc/mongoc_client_reset_sockettimeoutms.rst

@@ -0,0 +1,21 @@
+:man_page: mongoc_client_reset_sockettimeoutms
+
+mongoc_client_reset_sockettimeoutms()
+=======================
+
+Synopsis
+--------
+
+.. code-block:: c
+
+  void
+  mongoc_client_reset_sockettimeoutms (mongoc_client_t *client);
+
+Reset the sockettimeoutms of the mongoc_cluster_t object associated with the given mongoc_client_t object back to the default value.
+Primarily used inside mongoc_client_pool_push() when returning a client to a connection pool.
+
+Parameters
+----------
+
+* ``client``: A :symbol:`mongoc_client_t`.
+

src/libmongoc/doc/mongoc_client_update_sockettimeoutms.rst

@@ -0,0 +1,21 @@
+:man_page: mongoc_client_update_sockettimeoutms
+
+mongoc_client_update_sockettimeoutms()
+=======================
+
+Synopsis
+--------
+
+.. code-block:: c
+
+  void
+  mongoc_client_update_sockettimeoutms (mongoc_client_t *client, const uint32_t timeoutms);
+
+Change the sockettimeoutms of the mongoc_cluster_t object associated with the given mongoc_client_t object.
+
+Parameters
+----------
+
+* ``client``: A :symbol:`mongoc_client_t`.
+* ``timeoutms``: The requested timeout value in milliseconds.
+

src/libmongoc/src/mongoc/mongoc-client-pool.c

@@ -366,6 +366,9 @@ mongoc_client_pool_push (mongoc_client_pool_t *pool, mongoc_client_t *client)
    BSON_ASSERT_PARAM (pool);
    BSON_ASSERT_PARAM (client);
 
+   /* reset sockettimeoutms to the default in case it was changed with mongoc_client_update_sockettimeoutms() */
+   mongoc_client_reset_sockettimeoutms (client);
+
    bson_mutex_lock (&pool->mutex);
    _mongoc_queue_push_head (&pool->queue, client);
 

src/libmongoc/src/mongoc/mongoc-client.c

@@ -1125,6 +1125,19 @@ mongoc_client_destroy (mongoc_client_t *client)
 }
 
 
+void mongoc_client_update_sockettimeoutms (mongoc_client_t *client,
+                                           const uint32_t timeoutms)
+{
+   BSON_ASSERT_PARAM (client);
+   mongoc_cluster_update_sockettimeoutms (&client->cluster, timeoutms);
+}
+
+void mongoc_client_reset_sockettimeoutms (mongoc_client_t *client)
+{
+   BSON_ASSERT_PARAM (client);
+   mongoc_cluster_reset_sockettimeoutms (&client->cluster);
+}
+
 /*
  *--------------------------------------------------------------------------
  *

src/libmongoc/src/mongoc/mongoc-client.h

@@ -107,6 +107,10 @@ MONGOC_EXPORT (mongoc_client_t *)
 mongoc_client_new_from_uri (const mongoc_uri_t *uri) BSON_GNUC_WARN_UNUSED_RESULT;
 MONGOC_EXPORT (mongoc_client_t *)
 mongoc_client_new_from_uri_with_error (const mongoc_uri_t *uri, bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_client_update_sockettimeoutms (mongoc_client_t *client, const uint32_t timeoutms);
+MONGOC_EXPORT (void)
+mongoc_client_reset_sockettimeoutms (mongoc_client_t *client);
 MONGOC_EXPORT (const mongoc_uri_t *)
 mongoc_client_get_uri (const mongoc_client_t *client);
 MONGOC_EXPORT (void)

src/libmongoc/src/mongoc/mongoc-cluster-private.h

@@ -72,6 +72,13 @@ mongoc_cluster_init (mongoc_cluster_t *cluster, const mongoc_uri_t *uri, void *c
 void
 mongoc_cluster_destroy (mongoc_cluster_t *cluster);
 
+void
+mongoc_cluster_update_sockettimeoutms (mongoc_cluster_t *cluster,
+                                       const uint32_t sockettimeoutms);
+
+void
+mongoc_cluster_reset_sockettimeoutms (mongoc_cluster_t *cluster);
+
 void
 mongoc_cluster_disconnect_node (mongoc_cluster_t *cluster, uint32_t id);
 

src/libmongoc/src/mongoc/mongoc-cluster.c

@@ -2511,8 +2511,7 @@ mongoc_cluster_init (mongoc_cluster_t *cluster, const mongoc_uri_t *uri, void *c
    cluster->client = (mongoc_client_t *) client;
    cluster->requires_auth = (mongoc_uri_get_username (uri) || mongoc_uri_get_auth_mechanism (uri));
 
-   cluster->sockettimeoutms =
-      mongoc_uri_get_option_as_int32 (uri, MONGOC_URI_SOCKETTIMEOUTMS, MONGOC_DEFAULT_SOCKETTIMEOUTMS);
+   mongoc_cluster_reset_sockettimeoutms (cluster);
 
    cluster->socketcheckintervalms =
       mongoc_uri_get_option_as_int32 (uri, MONGOC_URI_SOCKETCHECKINTERVALMS, MONGOC_TOPOLOGY_SOCKET_CHECK_INTERVAL_MS);
@@ -2560,6 +2559,20 @@ mongoc_cluster_destroy (mongoc_cluster_t *cluster) /* INOUT */
    EXIT;
 }
 
+void mongoc_cluster_update_sockettimeoutms (mongoc_cluster_t *cluster,
+                                            const uint32_t timeoutms)
+{
+   BSON_ASSERT_PARAM (cluster);
+   cluster->sockettimeoutms = timeoutms;
+}
+
+void mongoc_cluster_reset_sockettimeoutms (mongoc_cluster_t *cluster)
+{
+   BSON_ASSERT_PARAM (cluster);
+   cluster->sockettimeoutms =
+      mongoc_uri_get_option_as_int32 (cluster->uri, MONGOC_URI_SOCKETTIMEOUTMS, MONGOC_DEFAULT_SOCKETTIMEOUTMS);
+}
+
 static uint32_t
 _mongoc_cluster_select_server_id (mongoc_client_session_t *cs,
                                   mongoc_topology_t *topology,