fix logic

Author: blink1073

pymongo/asynchronous/mongo_client.py

@@ -2777,10 +2777,10 @@ async def run(self) -> T:
             try:
                 res = await self._read() if self._is_read else await self._write()
                 await self._retry_policy.record_success(self._attempt_number > 0)
-                # Track whether the transaction has completed command.
+                # Track whether the transaction has completed a command.
                 # If we need to apply backpressure to the first command,
                 # we will need to revert back to starting state.
-                if self._session.in_transaction:
+                if self._session is not None and self._session.in_transaction:
                     self._session._transaction.has_completed_command = True
                 return res
             except ServerSelectionTimeoutError:
@@ -2796,7 +2796,6 @@ async def run(self) -> T:
                 always_retryable = False
                 overloaded = False
                 exc_to_check = exc
-
                 # Execute specialized catch on read
                 if self._is_read:
                     if isinstance(exc, (ConnectionFailure, OperationFailure)):
@@ -2820,11 +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.in_transaction
-                            and not self._session._transaction.has_completed_command
-                        ):
-                            self._session._transaction.set_starting()
+                        if self._session is not None and self._session.in_transaction:
+                            if not self._session._transaction.has_completed_command:
+                                self._session._transaction.set_starting()
+                    else:
+                        raise
 
                 # Specialized catch on write operation
                 if not self._is_read:
@@ -2860,11 +2859,9 @@ 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.in_transaction
-                        and not self._session._transaction.has_completed_command
-                    ):
-                        self._session._transaction.set_starting()
+                    if self._session is not None and self._session.in_transaction:
+                        if not self._session._transaction.has_completed_command:
+                            self._session._transaction.set_starting()
 
                 if self._client.topology_description.topology_type == TOPOLOGY_TYPE.Sharded:
                     self._deprioritized_servers.append(self._server)

pymongo/synchronous/mongo_client.py

@@ -2767,10 +2767,10 @@ def run(self) -> T:
             try:
                 res = self._read() if self._is_read else self._write()
                 self._retry_policy.record_success(self._attempt_number > 0)
-                # Track whether the transaction has completed command.
+                # Track whether the transaction has completed a command.
                 # If we need to apply backpressure to the first command,
                 # we will need to revert back to starting state.
-                if self._session.in_transaction:
+                if self._session is not None and self._session.in_transaction:
                     self._session._transaction.has_completed_command = True
                 return res
             except ServerSelectionTimeoutError:
@@ -2786,7 +2786,6 @@ def run(self) -> T:
                 always_retryable = False
                 overloaded = False
                 exc_to_check = exc
-
                 # Execute specialized catch on read
                 if self._is_read:
                     if isinstance(exc, (ConnectionFailure, OperationFailure)):
@@ -2810,11 +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.in_transaction
-                            and not self._session._transaction.has_completed_command
-                        ):
-                            self._session._transaction.set_starting()
+                        if self._session is not None and self._session.in_transaction:
+                            if not self._session._transaction.has_completed_command:
+                                self._session._transaction.set_starting()
+                    else:
+                        raise
 
                 # Specialized catch on write operation
                 if not self._is_read:
@@ -2850,11 +2849,9 @@ 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.in_transaction
-                        and not self._session._transaction.has_completed_command
-                    ):
-                        self._session._transaction.set_starting()
+                    if self._session is not None and self._session.in_transaction:
+                        if not self._session._transaction.has_completed_command:
+                            self._session._transaction.set_starting()
 
                 if self._client.topology_description.topology_type == TOPOLOGY_TYPE.Sharded:
                     self._deprioritized_servers.append(self._server)