CDRIVER-696: If the server description knows the last error, use it

Author: bjori

src/mongoc/mongoc-cluster.c

@@ -1383,10 +1383,10 @@ mongoc_cluster_fetch_stream (mongoc_cluster_t *cluster,
 
    /* in the single-threaded use case we share topology's streams */
    if (topology->single_threaded) {
+      sd = mongoc_topology_description_server_by_id (&topology->description, server_id);
 
       scanner_node = mongoc_topology_scanner_get_node (topology->scanner, server_id);
       if (!scanner_node) {
-         sd = mongoc_topology_description_server_by_id (&topology->description, server_id);
          if (sd && sd->error.code) {
             memcpy (error, &sd->error, sizeof *error);
          } else {
@@ -1402,18 +1402,21 @@ mongoc_cluster_fetch_stream (mongoc_cluster_t *cluster,
 
       stream = scanner_node->stream;
       if (!stream) {
-         bson_set_error (error,
-                         MONGOC_ERROR_STREAM,
-                         MONGOC_ERROR_STREAM_NOT_ESTABLISHED,
-                         "Could not find stream for node %u", server_id);
+         if (sd && sd->error.code) {
+            memcpy (error, &sd->error, sizeof *error);
+         } else {
+            bson_set_error (error,
+                            MONGOC_ERROR_STREAM,
+                            MONGOC_ERROR_STREAM_NOT_ESTABLISHED,
+                            "Could not find stream for node %u", server_id);
+         }
          GOTO(FETCH_FAIL);
       }
 
       /* if stream exists but isn't authed, a disconnect happened */
       if (cluster->requires_auth && !scanner_node->has_auth) {
 
          /* try to reconnect and re-authenticate */
-         sd = mongoc_topology_description_server_by_id (&topology->description, server_id);
          if (!sd) {
             bson_set_error (error,
                             MONGOC_ERROR_STREAM,

tests/test-mongoc-client.c

@@ -180,8 +180,8 @@ test_mongoc_client_authenticate_failure (void *context)
    assert(!r);
    r = mongoc_cursor_error(cursor, &error);
    assert(r);
-   assert(error.domain == MONGOC_ERROR_CLIENT);
-   assert(error.code == MONGOC_ERROR_CLIENT_AUTHENTICATE);
+   ASSERT_CMPINT (error.domain, ==, MONGOC_ERROR_CLIENT);
+   ASSERT_CMPINT (error.code, ==, MONGOC_ERROR_CLIENT_AUTHENTICATE);
    mongoc_cursor_destroy(cursor);
 
    /*
@@ -194,8 +194,8 @@ test_mongoc_client_authenticate_failure (void *context)
    r = mongoc_collection_insert (collection, MONGOC_INSERT_NONE,
                                  &empty, NULL, &error);
    assert (!r);
-   assert (error.domain == MONGOC_ERROR_CLIENT);
-   assert (error.code == MONGOC_ERROR_CLIENT_AUTHENTICATE);
+   ASSERT_CMPINT (error.domain, ==, MONGOC_ERROR_CLIENT);
+   ASSERT_CMPINT (error.code, ==, MONGOC_ERROR_CLIENT_AUTHENTICATE);
 
    /*
     * Try various commands while in the failed state to ensure we get the
@@ -207,8 +207,8 @@ test_mongoc_client_authenticate_failure (void *context)
    r = mongoc_collection_update (collection, MONGOC_UPDATE_NONE,
                                  &q, &empty, NULL, &error);
    assert (!r);
-   assert (error.domain == MONGOC_ERROR_CLIENT);
-   assert (error.code == MONGOC_ERROR_CLIENT_AUTHENTICATE);
+   ASSERT_CMPINT (error.domain, ==, MONGOC_ERROR_CLIENT);
+   ASSERT_CMPINT (error.code, ==, MONGOC_ERROR_CLIENT_AUTHENTICATE);
 
    bson_free (host);
    bson_free (uri_str_no_auth);