address review

Author: blink1073

pymongo/asynchronous/pool.py

@@ -1029,6 +1029,10 @@ async def remove_stale_sockets(self, reference_generation: int) -> None:
                     self.requests -= 1
                     self.size_cond.notify()
 
+            # Assume all non dns/tcp/timeout errors mean the server rejected the connection due to overload.
+            # if not errorDuringDnsTcp and not timeoutError:
+            #     error._add_error_label("SystemOverloadedError")
+
     def _handle_connection_error(self, error: Exception, phase: str) -> None:
         # Handle system overload condition.  When the base AutoReconnect is
         # raised and we are not an sdam pool, add to backoff and add the
@@ -1039,8 +1043,8 @@ def _handle_connection_error(self, error: Exception, phase: str) -> None:
             or ("connection closed" in str(error).lower() and self._backoff)
         ):
             self._backoff += 1
-            error._add_error_label("SystemOverloaded")
-            error._add_error_label("Retryable")
+            error._add_error_label("SystemOverloadedError")
+            error._add_error_label("RetryableError")
             print(f"Setting backoff in {phase}:", self._backoff)  # noqa: T201
 
     async def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> AsyncConnection:

pymongo/asynchronous/topology.py

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

pymongo/synchronous/pool.py

@@ -1025,6 +1025,10 @@ def remove_stale_sockets(self, reference_generation: int) -> None:
                     self.requests -= 1
                     self.size_cond.notify()
 
+            # Assume all non dns/tcp/timeout errors mean the server rejected the connection due to overload.
+            # if not errorDuringDnsTcp and not timeoutError:
+            #     error._add_error_label("SystemOverloadedError")
+
     def _handle_connection_error(self, error: Exception, phase: str) -> None:
         # Handle system overload condition.  When the base AutoReconnect is
         # raised and we are not an sdam pool, add to backoff and add the
@@ -1035,8 +1039,8 @@ def _handle_connection_error(self, error: Exception, phase: str) -> None:
             or ("connection closed" in str(error).lower() and self._backoff)
         ):
             self._backoff += 1
-            error._add_error_label("SystemOverloaded")
-            error._add_error_label("Retryable")
+            error._add_error_label("SystemOverloadedError")
+            error._add_error_label("RetryableError")
             print(f"Setting backoff in {phase}:", self._backoff)  # noqa: T201
 
     def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> Connection:

pymongo/synchronous/topology.py

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