CDRIVER-3405 change stream after retryable error fails

Author: bazile-clyde

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

@@ -1654,6 +1654,11 @@ _mongoc_client_retryable_write_command_with_stream (
       mongoc_server_stream_cleanup (retry_server_stream);
    }
 
+   if (ret && error) {
+      /* if a retry succeeded, clear the initial error */
+      memset (error, 0, sizeof (bson_error_t));
+   }
+
    RETURN (ret);
 }
 
@@ -1719,6 +1724,11 @@ _mongoc_client_retryable_read_command_with_stream (
       mongoc_server_stream_cleanup (retry_server_stream);
    }
 
+   if (ret && error) {
+      /* if a retry succeeded, clear the initial error */
+      memset (error, 0, sizeof (bson_error_t));
+   }
+
    RETURN (ret);
 }
 

src/libmongoc/tests/json-test-operations.c

@@ -17,16 +17,16 @@
 
 #include "bson/bson.h"
 
+#include "mongoc/mongoc-change-stream-private.h"
 #include "mongoc/mongoc-collection-private.h"
 #include "mongoc/mongoc-config.h"
 #include "mongoc/mongoc-cursor-private.h"
 #include "mongoc/mongoc-host-list-private.h"
 #include "mongoc/mongoc-server-description-private.h"
 #include "mongoc/mongoc-topology-description-private.h"
 #include "mongoc/mongoc-topology-private.h"
-#include "mongoc/mongoc-util-private.h"
-#include "mongoc/mongoc-util-private.h"
 #include "mongoc/mongoc-uri-private.h"
+#include "mongoc/mongoc-util-private.h"
 
 #include "json-test-operations.h"
 #include "json-test.h"
@@ -1759,6 +1759,13 @@ gridfs_download (mongoc_database_t *db,
    return true;
 }
 
+static bool
+op_error (const bson_t *operation)
+{
+   return bson_has_field (operation, "error") &&
+          bson_lookup_bool (operation, "error");
+}
+
 bool
 json_test_operation (json_test_ctx_t *ctx,
                      const bson_t *test,
@@ -1844,6 +1851,13 @@ json_test_operation (json_test_ctx_t *ctx,
          bson_t pipeline = BSON_INITIALIZER;
          mongoc_change_stream_destroy (ctx->change_stream);
          ctx->change_stream = mongoc_collection_watch (c, &pipeline, NULL);
+         res = (op_error (operation) == (bool) ctx->change_stream->err.code);
+         if (!res) {
+            test_error ("expected error=%s, but actual error='%s'",
+                        op_error (operation) ? "true" : "false",
+                        ctx->change_stream->err.message);
+         }
+
          bson_init (reply);
          bson_destroy (&pipeline);
       } else if (!strcmp (op_name, "mapReduce") ||
@@ -1865,6 +1879,13 @@ json_test_operation (json_test_ctx_t *ctx,
          bson_t pipeline = BSON_INITIALIZER;
          mongoc_change_stream_destroy (ctx->change_stream);
          ctx->change_stream = mongoc_database_watch (db, &pipeline, NULL);
+         res = (op_error (operation) == (bool) ctx->change_stream->err.code);
+         if (!res) {
+            test_error ("expected error=%s, but actual error='%s'",
+                        op_error (operation) ? "true" : "false",
+                        ctx->change_stream->err.message);
+         }
+
          bson_init (reply);
          bson_destroy (&pipeline);
       } else if (!strcmp (op_name, "listCollectionObjects")) {
@@ -1912,6 +1933,13 @@ json_test_operation (json_test_ctx_t *ctx,
          bson_t pipeline = BSON_INITIALIZER;
          mongoc_change_stream_destroy (ctx->change_stream);
          ctx->change_stream = mongoc_client_watch (c->client, &pipeline, NULL);
+         res = (op_error (operation) == (bool) ctx->change_stream->err.code);
+         if (!res) {
+            test_error ("expected error=%s, but actual error='%s'",
+                        op_error (operation) ? "true" : "false",
+                        ctx->change_stream->err.message);
+         }
+
          bson_init (reply);
          bson_destroy (&pipeline);
       } else if (!strcmp (op_name, "listDatabaseObjects")) {

src/libmongoc/tests/test-conveniences.h

@@ -65,6 +65,9 @@ bson_lookup_doc (const bson_t *b, const char *key, bson_t *doc);
 void
 bson_lookup_doc_null_ok (const bson_t *b, const char *key, bson_t *doc);
 
+bool
+bson_lookup_bool (const bson_t *b, const char *key);
+
 int32_t
 bson_lookup_int32 (const bson_t *b, const char *key);