CDRIVER-3287 run mongos txn tests in evergreen

- Unify the transactions and with_transactions test runners
- Skip tests due to readConcnern "snapshot"
- Skip three failing tests that require investigating
- Update all spec test JSON. Omits errors-client.json, waiting on CDRIVER-3215

Author: kevinAlbs

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

@@ -26,7 +26,7 @@
 #define SESSION_NEVER_USED (-1)
 
 #define WITH_TXN_TIMEOUT_MS (120 * 1000)
-#define DEFAULT_MAX_COMMIT_TIME_MS -1
+#define DEFAULT_MAX_COMMIT_TIME_MS 0
 
 static void
 txn_opts_set (mongoc_transaction_opt_t *opts,
@@ -975,8 +975,8 @@ mongoc_client_session_with_transaction (
          GOTO (done);
       }
 
-      /* Whether or not we used local_reply above, use it now, but
-    access it through active_reply so cleanup in DONE is simpler. */
+      /* Whether or not we used local_reply above, use it now, but access it
+       * through active_reply so cleanup in DONE is simpler. */
       bson_destroy (active_reply);
       active_reply = &local_reply;
 
@@ -1005,8 +1005,7 @@ mongoc_client_session_with_transaction (
                 *
                 * Here, we don't want to set active_reply = NULL when we
                 * destroy, because we want it to point to an uninitialized
-                * bson_t
-                * at the top of this loop every time.*/
+                * bson_t at the top of this loop every time.*/
                bson_destroy (active_reply);
                continue;
             }
@@ -1126,8 +1125,8 @@ mongoc_client_session_start_transaction (mongoc_client_session_t *session,
    _mongoc_client_session_unpin (session);
    session->txn.state = MONGOC_TRANSACTION_STARTING;
    /* Transactions spec: "Drivers MUST clear a session's cached
-      * 'recoveryToken' when transitioning to the 'no transaction' or
-      * 'starting transaction' state." */
+    * 'recoveryToken' when transitioning to the 'no transaction' or
+    * 'starting transaction' state." */
    bson_destroy (session->recovery_token);
    session->recovery_token = NULL;
 

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

@@ -25,11 +25,10 @@
 BSON_BEGIN_DECLS
 
 
-
 bool
 mongoc_uri_upsert_host_and_port (mongoc_uri_t *uri,
-				 const char *host_and_port,
-				 bson_error_t *error);
+                                 const char *host_and_port,
+                                 bson_error_t *error);
 bool
 mongoc_uri_upsert_host (mongoc_uri_t *uri,
                         const char *host,
@@ -54,6 +53,10 @@ _mongoc_uri_requires_auth_negotiation (const mongoc_uri_t *uri);
 const char *
 mongoc_uri_canonicalize_option (const char *key);
 
+mongoc_uri_t *
+_mongoc_uri_copy_and_replace_host_list (const mongoc_uri_t *original,
+                                        const char *host);
+
 BSON_END_DECLS
 
 

src/libmongoc/src/mongoc/mongoc-uri.c

@@ -2670,3 +2670,17 @@ _mongoc_uri_requires_auth_negotiation (const mongoc_uri_t *uri)
 {
    return mongoc_uri_get_username (uri) && !mongoc_uri_get_auth_mechanism (uri);
 }
+
+
+/* A bit of a hack. Needed for multi mongos tests to create a URI with the same
+ * auth, SSL, and compressors settings but with only one specific host. */
+mongoc_uri_t *
+_mongoc_uri_copy_and_replace_host_list (const mongoc_uri_t *original,
+                                        const char *host)
+{
+   mongoc_uri_t *uri = mongoc_uri_copy (original);
+   _mongoc_host_list_destroy_all (uri->hosts);
+   uri->hosts = bson_malloc0 (sizeof (mongoc_host_list_t));
+   _mongoc_host_list_from_string (uri->hosts, host);
+   return uri;
+}

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

@@ -26,6 +26,7 @@
 #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 "json-test-operations.h"
 #include "json-test.h"
@@ -69,7 +70,8 @@ json_test_ctx_init (json_test_ctx_t *ctx,
    ctx->config = config;
    ctx->n_events = 0;
    bson_init (&ctx->events);
-   ctx->test_framework_uri = test_framework_get_uri ();
+
+   ctx->test_framework_uri = mongoc_uri_copy (client->uri);
    ctx->acknowledged = true;
    ctx->verbose = test_framework_getenv_bool ("MONGOC_TEST_MONITORING_VERBOSE");
    bson_init (&ctx->lsids[0]);
@@ -347,6 +349,8 @@ error_code_from_name (const char *name)
       return 79;
    } else if (!strcmp (name, "UnsatisfiableWriteConcern")) {
       return 100;
+   } else if (!strcmp (name, "OperationNotSupportedInTransaction")) {
+      return 263;
    }
 
    test_error ("Add errorCodeName \"%s\" to error_code_from_name()", name);

src/libmongoc/tests/json-test.c

@@ -629,7 +629,7 @@ get_bson_from_json_file (char *filename)
 }
 
 static bool
-check_version_info (const bson_t *scenario)
+check_version_info (const bson_t *scenario, bool print_reason)
 {
    const char *s;
    char *padded;
@@ -643,7 +643,7 @@ check_version_info (const bson_t *scenario)
       bson_free (padded);
       server_version = test_framework_get_server_version ();
       if (server_version > test_version) {
-         if (test_suite_debug_output ()) {
+         if (print_reason && test_suite_debug_output ()) {
             printf ("      SKIP, maxServerVersion=\"%s\"\n", s);
             fflush (stdout);
          }
@@ -657,7 +657,7 @@ check_version_info (const bson_t *scenario)
       test_version = test_framework_str_to_version (s);
       server_version = test_framework_get_server_version ();
       if (server_version < test_version) {
-         if (test_suite_debug_output ()) {
+         if (print_reason && test_suite_debug_output ()) {
             printf ("      SKIP, minServerVersion=\"%s\"\n", s);
             fflush (stdout);
          }
@@ -698,8 +698,11 @@ check_version_info (const bson_t *scenario)
       }
 
       /* If we didn't match any of the listed topologies, skip */
-      printf ("     SKIP, test topologies do not match current %s setup\n",
-              current_topology);
+      if (print_reason && test_suite_debug_output ()) {
+         printf ("     SKIP, test topologies do not match current %s setup\n",
+                 current_topology);
+         fflush (stdout);
+      }
 
       return false;
    }
@@ -721,15 +724,20 @@ check_scenario_version (const bson_t *scenario)
 
       while (bson_iter_next (&iter)) {
          bson_iter_bson (&iter, &version_info);
-         if (check_version_info (&version_info)) {
+         if (check_version_info (&version_info, false)) {
             return true;
          }
       }
 
+      if (test_suite_debug_output ()) {
+         printf ("      SKIP, no matching topologies in runOn\n");
+         fflush (stdout);
+      }
+
       return false;
    }
 
-   return check_version_info (scenario);
+   return check_version_info (scenario, true);
 }
 
 
@@ -989,17 +997,18 @@ execute_test (const json_test_config_t *config,
       collection->client->topology, MONGOC_SS_WRITE, NULL, &error);
    ASSERT_OR_PRINT (server_id, error);
 
-   if (bson_has_field (test, "failPoint")) {
-      activate_fail_point (client, server_id, test, "failPoint");
-   }
-
    json_test_ctx_init (&ctx, test, client, db, collection, config);
-   set_apm_callbacks (&ctx, collection->client);
 
    if (config->before_test_cb) {
       config->before_test_cb (&ctx, test);
    }
 
+   if (bson_has_field (test, "failPoint")) {
+      activate_fail_point (client, server_id, test, "failPoint");
+   }
+
+   set_apm_callbacks (&ctx, collection->client);
+
    json_test_operations (&ctx, test);
 
    if (config->after_test_cb) {
@@ -1138,6 +1147,9 @@ set_uri_opts_from_bson (mongoc_uri_t *uri, const bson_t *opts)
       } else if (!strcmp (bson_iter_key (&iter), "retryWrites")) {
          mongoc_uri_set_option_as_bool (
             uri, "retryWrites", bson_iter_bool (&iter));
+      } else if (!strcmp (bson_iter_key (&iter), "heartbeatFrequencyMS")) {
+         mongoc_uri_set_option_as_int32 (
+            uri, "heartbeatFrequencyMS", bson_iter_int32 (&iter));
       } else {
          MONGOC_ERROR ("Unsupported clientOptions field \"%s\" in %s",
                        bson_iter_key (&iter),
@@ -1148,6 +1160,44 @@ set_uri_opts_from_bson (mongoc_uri_t *uri, const bson_t *opts)
 }
 
 
+static bool
+_should_skip_due_to_server_39704 (const bson_t *test)
+{
+   const char *desc = bson_lookup_utf8 (test, "description");
+   const char *bad_tests[] = {
+      "only first countDocuments includes readConcern",
+      "only first find includes readConcern",
+      "only first aggregate includes readConcern",
+      "only first distinct includes readConcern",
+      "only first runCommand includes readConcern",
+      "transaction options inherited from defaultTransactionOptions",
+      "startTransaction options override defaults",
+      "defaultTransactionOptions override client options",
+      "readConcern snapshot in startTransaction options",
+      "withTransaction inherits transaction options from "
+      "defaultTransactionOptions",
+      "withTransaction explicit transaction options",
+      "withTransaction explicit transaction options override "
+      "defaultTransactionOptions",
+      "withTransaction explicit transaction options override client options"};
+   int i;
+
+   /* Only an issue for sharded clusters. */
+   if (!test_framework_is_mongos ()) {
+      return false;
+   }
+
+   for (i = 0; i < sizeof (bad_tests) / sizeof (char *); i++) {
+      if (0 == strcmp (desc, bad_tests[i])) {
+         return true;
+      }
+   }
+
+
+   return false;
+}
+
+
 /*
  *-----------------------------------------------------------------------
  *
@@ -1221,13 +1271,22 @@ run_json_general_test (const json_test_config_t *config)
          continue;
       }
 
+      if (_should_skip_due_to_server_39704 (&test)) {
+         fprintf (stderr,
+                  " - %s SKIPPED, reason: SERVER-39704 causes sharded tests to "
+                  "fail when using readConcern: snapshot\n",
+                  description);
+         continue;
+      }
+
       bson_free (selected_test);
 
       uri = test_framework_get_uri ();
 
-      /* If we are using multiple mongos, hardcode them in, for now,
-    but keep the other URI components (CDRIVER-3285) */
-      if (bson_iter_init_find (&uri_iter, &test, "useMultipleMongoses")) {
+      /* If we are using multiple mongos, hardcode them in, for now, but keep
+       * the other URI components (CDRIVER-3285) */
+      if (bson_iter_init_find (&uri_iter, &test, "useMultipleMongoses") &&
+          bson_iter_as_bool (&uri_iter)) {
          ASSERT_OR_PRINT (
             mongoc_uri_upsert_host_and_port (uri, "localhost:27017", &error),
             error);

src/libmongoc/tests/json/transactions/abort.json

@@ -1,7 +1,17 @@
 {
-  "topology": [
-    "replicaset",
-    "sharded"
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
   ],
   "database_name": "transaction-tests",
   "collection_name": "test",

src/libmongoc/tests/json/transactions/bulk.json

@@ -1,7 +1,17 @@
 {
-  "topology": [
-    "replicaset",
-    "sharded"
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
   ],
   "database_name": "transaction-tests",
   "collection_name": "test",

src/libmongoc/tests/json/transactions/causal-consistency.json

@@ -1,7 +1,17 @@
 {
-  "topology": [
-    "replicaset",
-    "sharded"
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
   ],
   "database_name": "transaction-tests",
   "collection_name": "test",

src/libmongoc/tests/json/transactions/commit.json

@@ -1,7 +1,17 @@
 {
-  "topology": [
-    "replicaset",
-    "sharded"
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
   ],
   "database_name": "transaction-tests",
   "collection_name": "test",