wip add tests

Author: blink1073

pymongo/asynchronous/pool.py

@@ -1157,7 +1157,6 @@ async def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> A
 
         # Clear the backoff state.
         if self._backoff:
-            self._backoff = 0
             await self.ready()
 
         return conn
@@ -1242,7 +1241,7 @@ async def checkout(
             await self.checkin(conn)
 
     def _raise_if_not_ready(self, checkout_started_time: float, emit_event: bool) -> None:
-        if self.state != PoolState.READY:
+        if self.state not in (PoolState.READY, PoolState.BACKOFF):
             if emit_event:
                 duration = time.monotonic() - checkout_started_time
                 if self.enabled_for_cmap:

pymongo/logger.py

@@ -42,7 +42,7 @@ 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 attempt number {%s}"
+    POOL_BACKOFF = "Connection pool backoff attempt number %s"
 
     CONN_CREATED = "Connection created"
     CONN_READY = "Connection ready"

pymongo/monitoring.py

@@ -137,6 +137,9 @@ def pool_cleared(self, event):
         def pool_closed(self, event):
             logging.info("[pool {0.address}] pool closed".format(event))
 
+        def pool_backoff(self, event):
+            logging.info("[pool {0.address}] pool backoff attempt {0.event}".format(event))
+
         def connection_created(self, event):
             logging.info("[pool {0.address}][connection #{0.connection_id}] "
                          "connection created".format(event))
@@ -305,6 +308,15 @@ def pool_closed(self, event: PoolClosedEvent) -> None:
         """
         raise NotImplementedError
 
+    def pool_backoff(self, event: PoolBackoffEvent) -> None:
+        """Abstract method to handle a `PoolBackoffEvent`.
+
+        Emitted when a connection Pool is in backoff.
+
+        :param event: An instance of :class:`PoolBackoffEvent`.
+        """
+        raise NotImplementedError
+
     def connection_created(self, event: ConnectionCreatedEvent) -> None:
         """Abstract method to handle a :class:`ConnectionCreatedEvent`.
 
@@ -1852,12 +1864,12 @@ def publish_pool_closed(self, address: _Address) -> None:
             except Exception:
                 _handle_exception()
 
-    def publish_pool_backoutt(self, address: _Address, attempt: int) -> None:
+    def publish_pool_backoff(self, address: _Address, attempt: int) -> None:
         """Publish a :class:`PoolBackoffEvent` to all pool listeners."""
         event = PoolBackoffEvent(address, attempt)
         for subscriber in self.__cmap_listeners:
             try:
-                subscriber.pool_closed(event)
+                subscriber.pool_backoff(event)
             except Exception:
                 _handle_exception()
 

pymongo/synchronous/pool.py

@@ -1153,7 +1153,6 @@ def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> Connect
 
         # Clear the backoff state.
         if self._backoff:
-            self._backoff = 0
             self.ready()
 
         return conn
@@ -1238,7 +1237,7 @@ def checkout(
             self.checkin(conn)
 
     def _raise_if_not_ready(self, checkout_started_time: float, emit_event: bool) -> None:
-        if self.state != PoolState.READY:
+        if self.state not in (PoolState.READY, PoolState.BACKOFF):
             if emit_event:
                 duration = time.monotonic() - checkout_started_time
                 if self.enabled_for_cmap:

test/asynchronous/test_connection_monitoring.py

@@ -52,6 +52,7 @@
     ConnectionClosedReason,
     ConnectionCreatedEvent,
     ConnectionReadyEvent,
+    PoolBackoffEvent,
     PoolClearedEvent,
     PoolClosedEvent,
     PoolCreatedEvent,
@@ -75,6 +76,7 @@
     "ConnectionPoolReady": PoolReadyEvent,
     "ConnectionPoolCleared": PoolClearedEvent,
     "ConnectionPoolClosed": PoolClosedEvent,
+    "ConnectionPoolBackoff": PoolBackoffEvent,
     # Error types.
     "PoolClosedError": _PoolClosedError,
     "WaitQueueTimeoutError": WaitQueueTimeoutError,