CDRIVER-3116 do not disconnect in mongoc_client_reset

Author: jmikola

src/libmongoc/doc/mongoc_client_reset.rst

@@ -11,9 +11,9 @@ Synopsis
   void
   mongoc_client_reset (mongoc_client_t *client);
 
-Causes the client to clear its session pool without sending endSessions, and to close all its connections. Call this method in the child after forking.
+Call this method in the child after forking.
 
-This method increments an internal generation counter on the given client. After this method is called, cursors from previous generations will not issue a killCursors command when they are destroyed.
+This method causes the client to clear its session pool without sending endSessions. It also increments an internal generation counter on the given client. After this method is called, cursors from previous generations will not issue a killCursors command when they are destroyed. Client sessions from previous generations cannot be used and should be destroyed.
 
 Parameters
 ----------

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

@@ -2974,8 +2974,6 @@ mongoc_client_reset (mongoc_client_t *client)
 
    /* Server sessions are owned by us, so we clear the pool on reset. */
    _mongoc_topology_clear_session_pool (client->topology);
-
-   mongoc_cluster_disconnect (&(client->cluster));
 }
 
 mongoc_change_stream_t *

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

@@ -78,9 +78,6 @@ mongoc_cluster_init (mongoc_cluster_t *cluster,
 void
 mongoc_cluster_destroy (mongoc_cluster_t *cluster);
 
-void
-mongoc_cluster_disconnect (mongoc_cluster_t *cluster);
-
 void
 mongoc_cluster_disconnect_node (mongoc_cluster_t *cluster,
                                 uint32_t id,

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

@@ -1571,38 +1571,6 @@ _mongoc_cluster_disconnect_node_in_set (uint32_t id, void *item, void *ctx)
    return true;
 }
 
-/*
- *--------------------------------------------------------------------------
- *
- * mongoc_cluster_disconnect --
- *
- *       Disconnects all nodes in this cluster.
- *
- * Returns:
- *       None.
- *
- * Side effects:
- *       Clears the cluster's set of nodes and frees them if pooled.
- *
- *--------------------------------------------------------------------------
- */
-
-void
-mongoc_cluster_disconnect (mongoc_cluster_t *cluster)
-{
-   mongoc_topology_t *topology;
-
-   BSON_ASSERT (cluster);
-
-   topology = cluster->client->topology;
-   /* in the single-threaded use case we share topology's streams */
-   if (topology->single_threaded) {
-      mongoc_topology_scanner_disconnect (topology->scanner);
-   } else {
-      mongoc_set_for_each_with_id (
-         cluster->nodes, _mongoc_cluster_disconnect_node_in_set, cluster);
-   }
-}
 
 /*
  *--------------------------------------------------------------------------

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

@@ -3574,15 +3574,19 @@ test_client_reset_cursors (void)
 }
 
 static bool
-mongoc_topology_scanner_is_disconnected (mongoc_topology_scanner_t *scanner)
+mongoc_topology_scanner_is_connected (mongoc_topology_scanner_t *scanner)
 {
    mongoc_topology_scanner_node_t *node;
 
    BSON_ASSERT (scanner);
    node = scanner->nodes;
 
+   if (!node) {
+      return false;
+   }
+
    while (node) {
-      if (node->stream) {
+      if (!node->stream) {
          return false;
       }
 
@@ -3607,7 +3611,7 @@ test_client_reset_connections (void)
    autoresponder_id = mock_server_auto_ismaster (server, "{ 'isMaster': 1.0 }");
    mock_server_run (server);
 
-   /* After calling reset, check that connections have been closed. Set
+   /* After calling reset, check that connections are left as-is. Set
       heartbeat frequency high, so a background scan won't interfere. */
    uri = mongoc_uri_copy (mock_server_get_uri (server));
    mongoc_uri_set_option_as_int32 (uri, "heartbeatFrequencyMS", 99999);
@@ -3624,9 +3628,12 @@ test_client_reset_connections (void)
    ASSERT (future_get_bool (future));
 
    mock_server_remove_autoresponder (server, autoresponder_id);
+
+   ASSERT (mongoc_topology_scanner_is_connected (client->topology->scanner));
+
    mongoc_client_reset (client);
 
-   ASSERT (mongoc_topology_scanner_is_disconnected (client->topology->scanner));
+   ASSERT (mongoc_topology_scanner_is_connected (client->topology->scanner));
 
    request_destroy (request);
    future_destroy (future);