fix logic

Author: blink1073

pymongo/asynchronous/mongo_client.py

@@ -2819,7 +2819,11 @@ async def run(self) -> T:
 
                         # Revert back to starting state if we're in a transaction but haven't completed the first
                         # command.
-                        if self._session is not None and self._session.in_transaction:
+                        if (
+                            overloaded
+                            and self._session is not None
+                            and self._session.in_transaction
+                        ):
                             if not self._session._transaction.has_completed_command:
                                 self._session._transaction.set_starting()
                     else:
@@ -2859,7 +2863,7 @@ async def run(self) -> T:
                         self._last_error = exc
                     # Revert back to starting state if we're in a transaction but haven't completed the first
                     # command.
-                    if self._session is not None and self._session.in_transaction:
+                    if overloaded and self._session is not None and self._session.in_transaction:
                         if not self._session._transaction.has_completed_command:
                             self._session._transaction.set_starting()
 

pymongo/synchronous/mongo_client.py

@@ -2809,7 +2809,11 @@ def run(self) -> T:
 
                         # Revert back to starting state if we're in a transaction but haven't completed the first
                         # command.
-                        if self._session is not None and self._session.in_transaction:
+                        if (
+                            overloaded
+                            and self._session is not None
+                            and self._session.in_transaction
+                        ):
                             if not self._session._transaction.has_completed_command:
                                 self._session._transaction.set_starting()
                     else:
@@ -2849,7 +2853,7 @@ def run(self) -> T:
                         self._last_error = exc
                     # Revert back to starting state if we're in a transaction but haven't completed the first
                     # command.
-                    if self._session is not None and self._session.in_transaction:
+                    if overloaded and self._session is not None and self._session.in_transaction:
                         if not self._session._transaction.has_completed_command:
                             self._session._transaction.set_starting()
 

test/transactions/unified/backpressure-retryable-commit.json

@@ -238,9 +238,7 @@
             "client": "client0",
             "failPoint": {
               "configureFailPoint": "failCommand",
-              "mode": {
-                "times": 5
-              },
+              "mode": "alwaysOn",
               "data": {
                 "failCommands": [
                   "commitTransaction"
@@ -277,7 +275,10 @@
         },
         {
           "object": "session0",
-          "name": "commitTransaction"
+          "name": "commitTransaction",
+          "expectError": {
+            "isError": true
+          }
         }
       ],
       "expectEvents": [
@@ -367,11 +368,7 @@
         {
           "collectionName": "test",
           "databaseName": "transaction-tests",
-          "documents": [
-            {
-              "_id": 1
-            }
-          ]
+          "documents": []
         }
       ]
     }