check for both labels

Author: blink1073

pymongo/asynchronous/pool.py

@@ -1030,8 +1030,8 @@ def _handle_connection_error(self, error: BaseException, phase: str, conn_id: in
         # If found, add error labels.
         if self.is_sdam or type(error) != AutoReconnect:
             return
-        # error._add_error_label("SystemOverloadedError")
-        # error._add_error_label("RetryableError")
+        error._add_error_label("SystemOverloadedError")
+        error._add_error_label("RetryableError")
 
     async def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> AsyncConnection:
         """Connect to Mongo and return a new AsyncConnection.

pymongo/asynchronous/topology.py

@@ -890,8 +890,9 @@ async def _handle_error(self, address: _Address, err_ctx: _ErrorContext) -> None
                 # Clear the pool.
                 await server.reset(service_id)
         elif isinstance(error, ConnectionFailure):
-            if isinstance(error, WaitQueueTimeoutError) or error.has_error_label(
-                "SystemOverloadedError"
+            if isinstance(error, WaitQueueTimeoutError) or (
+                error.has_error_label("SystemOverloadedError")
+                and error.has_error_label("RetryableError")
             ):
                 return
             # "Client MUST replace the server's description with type Unknown

pymongo/synchronous/pool.py

@@ -1026,8 +1026,8 @@ def _handle_connection_error(self, error: BaseException, phase: str, conn_id: in
         # If found, add error labels.
         if self.is_sdam or type(error) != AutoReconnect:
             return
-        # error._add_error_label("SystemOverloadedError")
-        # error._add_error_label("RetryableError")
+        error._add_error_label("SystemOverloadedError")
+        error._add_error_label("RetryableError")
 
     def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> Connection:
         """Connect to Mongo and return a new Connection.

pymongo/synchronous/topology.py

@@ -888,8 +888,9 @@ def _handle_error(self, address: _Address, err_ctx: _ErrorContext) -> None:
                 # Clear the pool.
                 server.reset(service_id)
         elif isinstance(error, ConnectionFailure):
-            if isinstance(error, WaitQueueTimeoutError) or error.has_error_label(
-                "SystemOverloadedError"
+            if isinstance(error, WaitQueueTimeoutError) or (
+                error.has_error_label("SystemOverloadedError")
+                and error.has_error_label("RetryableError")
             ):
                 return
             # "Client MUST replace the server's description with type Unknown