CDRIVER-3949, CDRIVER-3963, CDRIVER-3966 aborting txn unpins session (#783)

Replace manual assignment with _mongoc_client_session_unpin

Ensures that session arg is appended to operation_find in unified test runner. Other operations will need to be addressed in CDRIVER-3964.

Syncs transaction spec tests with mongodb/specifications@ec32686

Author: jmikola

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

@@ -627,7 +627,7 @@ _mongoc_client_session_handle_reply (mongoc_client_session_t *session,
        * fails with a TransientTransactionError". If the server reply included
        * a TransientTransactionError, we unpin here. If a network error caused
        * us to add a label client-side, we unpin in network_error_reply. */
-      session->server_id = 0;
+      _mongoc_client_session_unpin (session);
    }
 
    while (bson_iter_next (&iter)) {
@@ -1266,13 +1266,19 @@ mongoc_client_session_abort_transaction (mongoc_client_session_t *session,
    case MONGOC_INTERNAL_TRANSACTION_STARTING:
       /* we sent no commands, not actually started on server */
       session->txn.state = MONGOC_INTERNAL_TRANSACTION_ABORTED;
+      /* Transactions Spec: aborting a transaction MUST unpin the session.
+       * It's likely the transaction is already unpinned if TRANSACTION_STARTING
+       * was just assigned, but there is no harm in doing so again. */
+      _mongoc_client_session_unpin (session);
       txn_opts_cleanup (&session->txn.opts);
       RETURN (true);
    case MONGOC_INTERNAL_TRANSACTION_IN_PROGRESS:
       session->txn.state = MONGOC_INTERNAL_TRANSACTION_ENDING;
       /* Transactions Spec: ignore errors from abortTransaction command */
       txn_abort (session, NULL, NULL);
       session->txn.state = MONGOC_INTERNAL_TRANSACTION_ABORTED;
+      /* Transactions Spec: aborting a transaction MUST unpin the session. */
+      _mongoc_client_session_unpin (session);
       RETURN (true);
    case MONGOC_INTERNAL_TRANSACTION_COMMITTED:
    case MONGOC_INTERNAL_TRANSACTION_COMMITTED_EMPTY:

src/libmongoc/tests/json/transactions/abort.json renamed to src/libmongoc/tests/json/transactions/legacy/abort.json

@@ -458,7 +458,8 @@
             "errorLabelsOmit": [
               "TransientTransactionError",
               "UnknownTransactionCommitResult"
-            ]
+            ],
+            "errorContains": "E11000"
           }
         },
         {

src/libmongoc/tests/json/transactions/bulk.json renamed to src/libmongoc/tests/json/transactions/legacy/bulk.json

@@ -304,9 +304,7 @@
                     "$set": {
                       "x": 1
                     }
-                  },
-                  "multi": false,
-                  "upsert": false
+                  }
                 },
                 {
                   "q": {
@@ -317,7 +315,6 @@
                       "x": 2
                     }
                   },
-                  "multi": false,
                   "upsert": true
                 }
               ],
@@ -379,19 +376,15 @@
                   },
                   "u": {
                     "y": 1
-                  },
-                  "multi": false,
-                  "upsert": false
+                  }
                 },
                 {
                   "q": {
                     "_id": 2
                   },
                   "u": {
                     "y": 2
-                  },
-                  "multi": false,
-                  "upsert": false
+                  }
                 }
               ],
               "ordered": true,
@@ -454,8 +447,7 @@
                       "z": 1
                     }
                   },
-                  "multi": true,
-                  "upsert": false
+                  "multi": true
                 }
               ],
               "ordered": true,

src/libmongoc/tests/json/transactions/causal-consistency.json renamed to src/libmongoc/tests/json/transactions/legacy/causal-consistency.json

@@ -40,8 +40,7 @@
               "$inc": {
                 "count": 1
               }
-            },
-            "upsert": false
+            }
           },
           "result": {
             "matchedCount": 1,
@@ -65,8 +64,7 @@
               "$inc": {
                 "count": 1
               }
-            },
-            "upsert": false
+            }
           },
           "result": {
             "matchedCount": 1,
@@ -93,9 +91,7 @@
                     "$inc": {
                       "count": 1
                     }
-                  },
-                  "multi": false,
-                  "upsert": false
+                  }
                 }
               ],
               "ordered": true,
@@ -123,9 +119,7 @@
                     "$inc": {
                       "count": 1
                     }
-                  },
-                  "multi": false,
-                  "upsert": false
+                  }
                 }
               ],
               "ordered": true,
@@ -212,8 +206,7 @@
               "$inc": {
                 "count": 1
               }
-            },
-            "upsert": false
+            }
           },
           "result": {
             "matchedCount": 1,
@@ -260,9 +253,7 @@
                     "$inc": {
                       "count": 1
                     }
-                  },
-                  "multi": false,
-                  "upsert": false
+                  }
                 }
               ],
               "ordered": true,