AC + CP review

Author: NoahStapp

pymongo/logger.py

@@ -42,7 +42,6 @@ class _ConnectionStatusMessage(str, enum.Enum):
     POOL_READY = "Connection pool ready"
     POOL_CLOSED = "Connection pool closed"
     POOL_CLEARED = "Connection pool cleared"
-    POOL_BACKOFF = "Connection pool backoff"
 
     CONN_CREATED = "Connection created"
     CONN_READY = "Connection ready"
@@ -89,7 +88,6 @@ class _SDAMStatusMessage(str, enum.Enum):
 _VERBOSE_CONNECTION_ERROR_REASONS = {
     ConnectionClosedReason.POOL_CLOSED: "Connection pool was closed",
     ConnectionCheckOutFailedReason.POOL_CLOSED: "Connection pool was closed",
-    ConnectionClosedReason.POOL_BACKOFF: "Connection pool is in backoff",
     ConnectionClosedReason.STALE: "Connection pool was stale",
     ConnectionClosedReason.ERROR: "An error occurred while using the connection",
     ConnectionCheckOutFailedReason.CONN_ERROR: "An error occurred while trying to establish a new connection",

pymongo/monitoring.py

@@ -934,9 +934,6 @@ class ConnectionClosedReason:
     POOL_CLOSED = "poolClosed"
     """The pool was closed, making the connection no longer valid."""
 
-    POOL_BACKOFF = "poolBackoff"
-    """The pool is in backoff mode."""
-
 
 class ConnectionCheckOutFailedReason:
     """An enum that defines values for `reason` on a

test/asynchronous/test_retryable_writes.py

@@ -657,13 +657,15 @@ def failed(event: CommandFailedEvent) -> None:
                 return
             assert event.failure["code"] == 91
             self.configure_fail_point_sync(command_args_inner)
+            self.addCleanup(self.configure_fail_point_sync, {}, off=True)
             listener.failed_events.append(event)
 
         listener.failed = failed
 
         client = await self.async_rs_client(retryWrites=True, event_listeners=[listener])
 
         self.configure_fail_point_sync(command_args)
+        self.addCleanup(self.configure_fail_point_sync, {}, off=True)
 
         # Attempt an insertOne operation on any record for any database and collection.
         # Expect the insertOne to fail with a server error.
@@ -673,9 +675,6 @@ def failed(event: CommandFailedEvent) -> None:
         # Assert that the error code of the server error is 10107.
         assert exc.exception.errors["code"] == 10107  # type:ignore[call-overload]
 
-        # Disable the fail point.
-        self.configure_fail_point_sync({}, off=True)
-
     async def test_02_drivers_return_the_correct_error_when_receiving_only_errors_with_NoWritesPerformed(
         self
     ) -> None:
@@ -711,13 +710,15 @@ def failed(event: CommandFailedEvent) -> None:
             # Configure the 10107 fail point command only if the the failed event is for the 91 error configured in step 2.
             assert event.failure["code"] == 91
             self.configure_fail_point_sync(command_args_inner)
+            self.addCleanup(self.configure_fail_point_sync, {}, off=True)
             listener.failed_events.append(event)
 
         listener.failed = failed
 
         client = await self.async_rs_client(retryWrites=True, event_listeners=[listener])
 
         self.configure_fail_point_sync(command_args)
+        self.addCleanup(self.configure_fail_point_sync, {}, off=True)
 
         # Attempt an insertOne operation on any record for any database and collection.
         # Expect the insertOne to fail with a server error.
@@ -727,9 +728,6 @@ def failed(event: CommandFailedEvent) -> None:
         # Assert that the error code of the server error is 91.
         assert exc.exception.errors["code"] == 91  # type:ignore[call-overload]
 
-        # Disable the fail point.
-        self.configure_fail_point_sync({}, off=True)
-
     async def test_03_drivers_return_the_correct_error_when_receiving_some_errors_with_NoWritesPerformed_and_some_without_NoWritesPerformed(
         self
     ) -> None:
@@ -766,13 +764,15 @@ def failed(event: CommandFailedEvent) -> None:
                 return
             assert event.failure["code"] == 91
             self.configure_fail_point_sync(command_args_inner)
+            self.addCleanup(self.configure_fail_point_sync, {}, off=True)
             listener.failed_events.append(event)
 
         listener.failed = failed
 
         client = await self.async_rs_client(retryWrites=True, event_listeners=[listener])
 
         self.configure_fail_point_sync(command_args)
+        self.addCleanup(self.configure_fail_point_sync, {}, off=True)
 
         # Attempt an insertOne operation on any record for any database and collection.
         # Expect the insertOne to fail with a server error.
@@ -784,9 +784,6 @@ def failed(event: CommandFailedEvent) -> None:
         # Assert that the error does not contain the error label `NoWritesPerformed`.
         assert "NoWritesPerformed" not in exc.exception.errors["errorLabels"]
 
-        # Disable the fail point.
-        self.configure_fail_point_sync({}, off=True)
-
 
 if __name__ == "__main__":
     unittest.main()

test/test_retryable_writes.py

@@ -653,13 +653,15 @@ def failed(event: CommandFailedEvent) -> None:
                 return
             assert event.failure["code"] == 91
             self.configure_fail_point_sync(command_args_inner)
+            self.addCleanup(self.configure_fail_point_sync, {}, off=True)
             listener.failed_events.append(event)
 
         listener.failed = failed
 
         client = self.rs_client(retryWrites=True, event_listeners=[listener])
 
         self.configure_fail_point_sync(command_args)
+        self.addCleanup(self.configure_fail_point_sync, {}, off=True)
 
         # Attempt an insertOne operation on any record for any database and collection.
         # Expect the insertOne to fail with a server error.
@@ -669,9 +671,6 @@ def failed(event: CommandFailedEvent) -> None:
         # Assert that the error code of the server error is 10107.
         assert exc.exception.errors["code"] == 10107  # type:ignore[call-overload]
 
-        # Disable the fail point.
-        self.configure_fail_point_sync({}, off=True)
-
     def test_02_drivers_return_the_correct_error_when_receiving_only_errors_with_NoWritesPerformed(
         self
     ) -> None:
@@ -707,13 +706,15 @@ def failed(event: CommandFailedEvent) -> None:
             # Configure the 10107 fail point command only if the the failed event is for the 91 error configured in step 2.
             assert event.failure["code"] == 91
             self.configure_fail_point_sync(command_args_inner)
+            self.addCleanup(self.configure_fail_point_sync, {}, off=True)
             listener.failed_events.append(event)
 
         listener.failed = failed
 
         client = self.rs_client(retryWrites=True, event_listeners=[listener])
 
         self.configure_fail_point_sync(command_args)
+        self.addCleanup(self.configure_fail_point_sync, {}, off=True)
 
         # Attempt an insertOne operation on any record for any database and collection.
         # Expect the insertOne to fail with a server error.
@@ -723,9 +724,6 @@ def failed(event: CommandFailedEvent) -> None:
         # Assert that the error code of the server error is 91.
         assert exc.exception.errors["code"] == 91  # type:ignore[call-overload]
 
-        # Disable the fail point.
-        self.configure_fail_point_sync({}, off=True)
-
     def test_03_drivers_return_the_correct_error_when_receiving_some_errors_with_NoWritesPerformed_and_some_without_NoWritesPerformed(
         self
     ) -> None:
@@ -762,13 +760,15 @@ def failed(event: CommandFailedEvent) -> None:
                 return
             assert event.failure["code"] == 91
             self.configure_fail_point_sync(command_args_inner)
+            self.addCleanup(self.configure_fail_point_sync, {}, off=True)
             listener.failed_events.append(event)
 
         listener.failed = failed
 
         client = self.rs_client(retryWrites=True, event_listeners=[listener])
 
         self.configure_fail_point_sync(command_args)
+        self.addCleanup(self.configure_fail_point_sync, {}, off=True)
 
         # Attempt an insertOne operation on any record for any database and collection.
         # Expect the insertOne to fail with a server error.
@@ -780,9 +780,6 @@ def failed(event: CommandFailedEvent) -> None:
         # Assert that the error does not contain the error label `NoWritesPerformed`.
         assert "NoWritesPerformed" not in exc.exception.errors["errorLabels"]
 
-        # Disable the fail point.
-        self.configure_fail_point_sync({}, off=True)
-
 
 if __name__ == "__main__":
     unittest.main()