CDRIVER-3366 reset max_commit_time_ms in txn_opts_cleanup

Author: alcaeus

src/libmongoc/src/mongoc/mongoc-client-session-private.h

@@ -26,6 +26,7 @@
 #define TRANSIENT_TXN_ERR "TransientTransactionError"
 #define UNKNOWN_COMMIT_RESULT "UnknownTransactionCommitResult"
 #define MAX_TIME_MS_EXPIRED "MaxTimeMSExpired"
+#define DEFAULT_MAX_COMMIT_TIME_MS 0
 
 #define MONGOC_DEFAULT_WTIMEOUT_FOR_COMMIT_RETRY 10000
 

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

@@ -26,7 +26,6 @@
 #define SESSION_NEVER_USED (-1)
 
 #define WITH_TXN_TIMEOUT_MS (120 * 1000)
-#define DEFAULT_MAX_COMMIT_TIME_MS 0
 
 static void
 txn_opts_set (mongoc_transaction_opt_t *opts,
@@ -64,6 +63,7 @@ txn_opts_cleanup (mongoc_transaction_opt_t *opts)
    opts->read_concern = NULL;
    opts->write_concern = NULL;
    opts->read_prefs = NULL;
+   opts->max_commit_time_ms = DEFAULT_MAX_COMMIT_TIME_MS;
 }
 
 
@@ -1261,6 +1261,7 @@ mongoc_client_session_abort_transaction (mongoc_client_session_t *session,
    case MONGOC_TRANSACTION_STARTING:
       /* we sent no commands, not actually started on server */
       session->txn.state = MONGOC_TRANSACTION_ABORTED;
+      txn_opts_cleanup (&session->txn.opts);
       RETURN (true);
    case MONGOC_TRANSACTION_IN_PROGRESS:
       session->txn.state = MONGOC_TRANSACTION_ENDING;

src/libmongoc/tests/test-mongoc-transactions.c

@@ -1055,6 +1055,62 @@ test_get_transaction_opts (void)
    mock_server_destroy (server);
 }
 
+static void
+test_max_commit_time_ms_is_reset (void *ctx)
+{
+   mock_rs_t *rs;
+   mongoc_uri_t *uri = NULL;
+   mongoc_client_t *client = NULL;
+   mongoc_transaction_opt_t *txn_opts = NULL;
+   mongoc_session_opt_t *session_opts = NULL;
+   mongoc_client_session_t *session = NULL;
+   bson_error_t error;
+   bool r;
+
+   rs = mock_rs_with_autoismaster (WIRE_VERSION_4_2,
+                                   true /* has primary */,
+                                   2 /* secondaries */,
+                                   0 /* arbiters */);
+
+   mock_rs_run (rs);
+   uri = mongoc_uri_copy (mock_rs_get_uri (rs));
+
+   client = mongoc_client_new_from_uri (uri);
+   BSON_ASSERT (client);
+
+   txn_opts = mongoc_transaction_opts_new ();
+   session_opts = mongoc_session_opts_new ();
+
+   session = mongoc_client_start_session (client, session_opts, &error);
+   ASSERT_OR_PRINT (session, error);
+
+   mongoc_transaction_opts_set_max_commit_time_ms (txn_opts, 1);
+
+   r = mongoc_client_session_start_transaction (session, txn_opts, &error);
+   ASSERT_OR_PRINT (r, error);
+   BSON_ASSERT (1 == session->txn.opts.max_commit_time_ms);
+
+   r = mongoc_client_session_abort_transaction (session, &error);
+   ASSERT_OR_PRINT (r, error);
+   BSON_ASSERT (DEFAULT_MAX_COMMIT_TIME_MS == session->txn.opts.max_commit_time_ms);
+
+   mongoc_transaction_opts_set_max_commit_time_ms (txn_opts, DEFAULT_MAX_COMMIT_TIME_MS);
+
+   r = mongoc_client_session_start_transaction (session, txn_opts, &error);
+   ASSERT_OR_PRINT (r, error);
+   BSON_ASSERT (DEFAULT_MAX_COMMIT_TIME_MS == session->txn.opts.max_commit_time_ms);
+
+   r = mongoc_client_session_abort_transaction (session, &error);
+   ASSERT_OR_PRINT (r, error);
+
+   mongoc_session_opts_destroy (session_opts);
+   mongoc_transaction_opts_destroy (txn_opts);
+   mongoc_client_session_destroy (session);
+   mongoc_client_destroy (client);
+   mongoc_uri_destroy (uri);
+   mock_rs_destroy (rs);
+}
+
 void
 test_transactions_install (TestSuite *suite)
 {
@@ -1134,4 +1190,10 @@ test_transactions_install (TestSuite *suite)
                                 "/transactions/get_transaction_opts",
                                 test_get_transaction_opts,
                                 test_framework_skip_if_no_crypto);
+   TestSuite_AddFull (suite,
+                      "/transactions/max_commit_time_ms_is_reset",
+                      test_max_commit_time_ms_is_reset,
+                      NULL,
+                      NULL,
+                      NULL);
 }