CDRIVER-1922 second assert err in stream_not_found

Author: ajdavis

src/mongoc/mongoc-cluster.c

@@ -1489,10 +1489,14 @@ mongoc_server_stream_t *
 _mongoc_cluster_stream_for_server (mongoc_cluster_t *cluster,
                                    uint32_t          server_id,
                                    bool              reconnect_ok,
-                                   bson_error_t     *error)
+                                   bson_error_t     *error /* OUT */)
 {
    mongoc_topology_t *topology;
    mongoc_server_stream_t *server_stream;
+   bson_error_t err_local;
+   /* if fetch_stream fails we need a place to receive error details and pass
+    * them to mongoc_topology_invalidate_server. */
+   bson_error_t *err_ptr = error ? error : &err_local;
 
    ENTRY;
 
@@ -1503,27 +1507,27 @@ _mongoc_cluster_stream_for_server (mongoc_cluster_t *cluster,
       server_stream = mongoc_cluster_fetch_stream_single (cluster,
                                                           server_id,
                                                           reconnect_ok,
-                                                          error);
+                                                          err_ptr);
 
    } else {
       server_stream = mongoc_cluster_fetch_stream_pooled (cluster,
                                                           server_id,
                                                           reconnect_ok,
-                                                          error);
+                                                          err_ptr);
 
    }
 
    if (!server_stream) {
-      /* Server Discovery And Monitoring Spec: When an application operation
+      /* Server Discovery And Monitoring Spec: "When an application operation
        * fails because of any network error besides a socket timeout, the
        * client MUST replace the server's description with a default
        * ServerDescription of type Unknown, and fill the ServerDescription's
-       * error field with useful information.
+       * error field with useful information."
        *
        * error was filled by fetch_stream_single/pooled, pass it to invalidate()
        */
       mongoc_cluster_disconnect_node (cluster, server_id);
-      mongoc_topology_invalidate_server (topology, server_id, error);
+      mongoc_topology_invalidate_server (topology, server_id, err_ptr);
    }
 
    RETURN (server_stream);

tests/test-mongoc-client.c

@@ -2538,6 +2538,83 @@ test_client_appname_pooled_no_uri (void)
    test_client_appname (true, false);
 }
 
+/* test a disconnect with a NULL bson_error_t * passed to command_simple() */
+static void
+_test_null_error_pointer (bool pooled)
+{
+   mock_server_t *server;
+   mongoc_uri_t *uri;
+   mongoc_client_pool_t *pool = NULL;
+   mongoc_client_t *client;
+   future_t *future;
+   request_t *request;
+
+   capture_logs (true);
+
+   server = mock_server_with_autoismaster (0);
+   mock_server_run (server);
+   uri = mongoc_uri_copy (mock_server_get_uri (server));
+   mongoc_uri_set_option_as_int32 (uri, "serverSelectionTimeoutMS", 1000);
+
+   if (pooled) {
+      pool = mongoc_client_pool_new (uri);
+      client = mongoc_client_pool_pop (pool);
+   } else {
+      client = mongoc_client_new_from_uri (uri);
+   }
+
+   /* connect */
+   future = future_client_command_simple (client, "test",
+                                          tmp_bson ("{'ping': 1}"), NULL, NULL,
+                                          NULL);
+   request = mock_server_receives_command (server, "test",
+                                           MONGOC_QUERY_SLAVE_OK, NULL);
+   mock_server_replies_ok_and_destroys (request);
+   ASSERT (future_get_bool (future));
+   future_destroy (future);
+
+   /* disconnect */
+   mock_server_destroy (server);
+   if (pooled) {
+      mongoc_cluster_disconnect_node (&client->cluster, 1);
+   } else {
+      mongoc_topology_scanner_node_t *scanner_node;
+
+      scanner_node = mongoc_topology_scanner_get_node (
+         client->topology->scanner, 1);
+      mongoc_stream_destroy (scanner_node->stream);
+      scanner_node->stream = NULL;
+   }
+
+   /* doesn't abort with assertion failure */
+   future = future_client_command_simple (client, "test",
+                                          tmp_bson ("{'ping': 1}"), NULL, NULL,
+                                          NULL /* error */);
+
+   ASSERT (!future_get_bool (future));
+   future_destroy (future);
+
+   if (pooled) {
+      mongoc_client_pool_push (pool, client);
+      mongoc_client_pool_destroy (pool);
+   } else {
+      mongoc_client_destroy (client);
+   }
+
+   mongoc_uri_destroy (uri);
+}
+
+static void
+test_null_error_pointer_single (void *ctx)
+{
+   _test_null_error_pointer (false);
+}
+
+static void
+test_null_error_pointer_pooled (void *ctx)
+{
+   _test_null_error_pointer (true);
+}
 
 void
 test_client_install (TestSuite *suite)
@@ -2640,4 +2717,10 @@ test_client_install (TestSuite *suite)
    TestSuite_AddLive (suite, "/Client/select_server/pooled", test_mongoc_client_select_server_pooled);
    TestSuite_AddLive (suite, "/Client/select_server/err/single", test_mongoc_client_select_server_error_single);
    TestSuite_AddLive (suite, "/Client/select_server/err/pooled", test_mongoc_client_select_server_error_pooled);
+   TestSuite_AddFull (suite, "/Client/null_error_pointer/single",
+                      test_null_error_pointer_single, NULL, NULL,
+                      test_framework_skip_if_slow);
+   TestSuite_AddFull (suite, "/Client/null_error_pointer/pooled",
+                      test_null_error_pointer_pooled, NULL, NULL,
+                      test_framework_skip_if_slow);
 }