PYTHON-1828 Send recoveryToken on abortTransaction

Author: ShaneHarvey

pymongo/client_session.py

@@ -635,14 +635,13 @@ def _finish_transaction(self, command_name, retrying):
         # subsequent commitTransaction commands should be upgraded to use
         # w:"majority" and set a default value of 10 seconds for wtimeout.
         wc = self._transaction.opts.write_concern
-        is_commit = command_name == "commitTransaction"
-        if retrying and is_commit:
+        if retrying and command_name == "commitTransaction":
             wc_doc = wc.document
             wc_doc["w"] = "majority"
             wc_doc.setdefault("wtimeout", 10000)
             wc = WriteConcern(**wc_doc)
         cmd = SON([(command_name, 1)])
-        if self._transaction.recovery_token and is_commit:
+        if self._transaction.recovery_token:
             cmd['recoveryToken'] = self._transaction.recovery_token
         with self._client._socket_for_writes(self) as sock_info:
             return self._client.admin._command(

test/transactions/mongos-pin-auto.json

@@ -296,7 +296,7 @@
               "startTransaction": null,
               "autocommit": false,
               "writeConcern": null,
-              "recoveryToken": null
+              "recoveryToken": 42
             },
             "command_name": "abortTransaction",
             "database_name": "admin"

test/transactions/mongos-recovery-token.json

@@ -393,7 +393,7 @@
       }
     },
     {
-      "description": "abortTransaction does not send recoveryToken",
+      "description": "abortTransaction sends recoveryToken",
       "useMultipleMongoses": true,
       "operations": [
         {
@@ -472,7 +472,7 @@
               "startTransaction": null,
               "autocommit": false,
               "writeConcern": null,
-              "recoveryToken": null
+              "recoveryToken": 42
             },
             "command_name": "abortTransaction",
             "database_name": "admin"
@@ -489,7 +489,7 @@
               "startTransaction": null,
               "autocommit": false,
               "writeConcern": null,
-              "recoveryToken": null
+              "recoveryToken": 42
             },
             "command_name": "abortTransaction",
             "database_name": "admin"

test/transactions/pin-mongos.json

@@ -1049,7 +1049,7 @@
               "startTransaction": null,
               "autocommit": false,
               "writeConcern": null,
-              "recoveryToken": null
+              "recoveryToken": 42
             },
             "command_name": "abortTransaction",
             "database_name": "admin"