address review

Author: blink1073

pymongo/asynchronous/pool.py

@@ -1075,8 +1075,13 @@ async def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> A
         if self._backoff:
             await asyncio.sleep(_backoff(self._backoff))
 
+        # Pass a context to determine if we successfully create a configured socket.
+        context = dict(has_created_socket=False)
+
         try:
-            networking_interface = await _configured_protocol_interface(self.address, self.opts)
+            networking_interface = await _configured_protocol_interface(
+                self.address, self.opts, context
+            )
         # Catch KeyboardInterrupt, CancelledError, etc. and cleanup.
         except BaseException as error:
             async with self.lock:
@@ -1097,7 +1102,8 @@ async def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> A
                     reason=_verbose_connection_error_reason(ConnectionClosedReason.ERROR),
                     error=ConnectionClosedReason.ERROR,
                 )
-            self._handle_connection_error(error, "handshake")
+            if context["has_created_socket"]:
+                self._handle_connection_error(error, "handshake")
             if isinstance(error, (IOError, OSError, *SSLErrors)):
                 details = _get_timeout_details(self.opts)
                 _raise_connection_failure(self.address, error, timeout_details=details)

pymongo/pool_shared.py

@@ -250,6 +250,7 @@ async def _configured_protocol_interface(
     address: _Address,
     options: PoolOptions,
     protocol_kls: type[PyMongoBaseProtocol] = PyMongoProtocol,
+    context: dict[str, bool] | None = None,
 ) -> AsyncNetworkingInterface:
     """Given (host, port) and PoolOptions, return a configured AsyncNetworkingInterface.
 
@@ -261,6 +262,10 @@ async def _configured_protocol_interface(
     ssl_context = options._ssl_context
     timeout = options.socket_timeout
 
+    # Signal that we have created the socket successfully.
+    if context:
+        context["has_created_socket"] = True
+
     if ssl_context is None:
         return AsyncNetworkingInterface(
             await asyncio.get_running_loop().create_connection(
@@ -374,7 +379,7 @@ def _create_connection(address: _Address, options: PoolOptions) -> socket.socket
 
 
 def _configured_socket_interface(
-    address: _Address, options: PoolOptions, *args: Any
+    address: _Address, options: PoolOptions, *args: Any, context: dict[str, bool] | None = None
 ) -> NetworkingInterface:
     """Given (host, port) and PoolOptions, return a NetworkingInterface wrapping a configured socket.
 
@@ -385,6 +390,10 @@ def _configured_socket_interface(
     sock = _create_connection(address, options)
     ssl_context = options._ssl_context
 
+    # Signal that we have created the socket successfully.
+    if context:
+        context["has_created_socket"] = True
+
     if ssl_context is None:
         sock.settimeout(options.socket_timeout)
         return NetworkingInterface(sock)

pymongo/synchronous/pool.py

@@ -1071,8 +1071,11 @@ def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> Connect
         if self._backoff:
             time.sleep(_backoff(self._backoff))
 
+        # Pass a context to determine if we successfully create a configured socket.
+        context = dict(has_created_socket=False)
+
         try:
-            networking_interface = _configured_socket_interface(self.address, self.opts)
+            networking_interface = _configured_socket_interface(self.address, self.opts, context)
         # Catch KeyboardInterrupt, CancelledError, etc. and cleanup.
         except BaseException as error:
             with self.lock:
@@ -1093,7 +1096,8 @@ def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> Connect
                     reason=_verbose_connection_error_reason(ConnectionClosedReason.ERROR),
                     error=ConnectionClosedReason.ERROR,
                 )
-            self._handle_connection_error(error, "handshake")
+            if context["has_created_socket"]:
+                self._handle_connection_error(error, "handshake")
             if isinstance(error, (IOError, OSError, *SSLErrors)):
                 details = _get_timeout_details(self.opts)
                 _raise_connection_failure(self.address, error, timeout_details=details)