CDRIVER-683 & CDRIVER-810: Disconnect from a node properly

Even in single threaded mode
mongodb · Sep 16, 2015 · 11760f8 · 11760f8
1 parent f512cbf
commit 11760f8
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/mongoc/mongoc-cluster.c b/src/mongoc/mongoc-cluster.c
@@ -1074,6 +1074,15 @@ mongoc_cluster_disconnect_node (mongoc_cluster_t *cluster, uint32_t server_id)
    ENTRY;
 
    if (cluster->client->topology->single_threaded) {
+      mongoc_topology_scanner_node_t *scanner_node;
+
+      scanner_node = mongoc_topology_scanner_get_node (cluster->client->topology->scanner, server_id);
+
+      /* might never actually have connected */
+      if (scanner_node && scanner_node->stream) {
+         mongoc_topology_scanner_node_destroy (scanner_node, true);
+         EXIT;
+      }
       EXIT;
    } else {
       mongoc_set_rm(cluster->nodes, server_id);