Drop stale unavailable pool connections

Author: Mirochill

httpcore/_async/connection_pool.py

@@ -242,6 +242,17 @@ async def handle_async_request(self, request: Request) -> Response:
                     #
                     # In this case we clear the connection and try again.
                     pool_request.clear_connection()
+                    with self._optional_thread_lock:
+                        closing = []
+                        # If the connection still claims to be available then
+                        # it would be immediately assigned again, so drop it.
+                        if (
+                            connection in self._connections
+                            and connection.is_available()
+                        ):
+                            self._connections.remove(connection)
+                            closing.append(connection)
+                    await self._close_connections(closing)
                 else:
                     break  # pragma: nocover
 

httpcore/_async/http2.py

@@ -511,6 +511,7 @@ def can_handle_request(self, origin: Origin) -> bool:
     def is_available(self) -> bool:
         return (
             self._state != HTTPConnectionState.CLOSED
+            and self._connection_terminated is None
             and not self._connection_error
             and not self._used_all_stream_ids
             and not (

httpcore/_sync/connection_pool.py

@@ -242,6 +242,17 @@ def handle_request(self, request: Request) -> Response:
                     #
                     # In this case we clear the connection and try again.
                     pool_request.clear_connection()
+                    with self._optional_thread_lock:
+                        closing = []
+                        # If the connection still claims to be available then
+                        # it would be immediately assigned again, so drop it.
+                        if (
+                            connection in self._connections
+                            and connection.is_available()
+                        ):
+                            self._connections.remove(connection)
+                            closing.append(connection)
+                    self._close_connections(closing)
                 else:
                     break  # pragma: nocover
 

httpcore/_sync/http2.py

@@ -511,6 +511,7 @@ def can_handle_request(self, origin: Origin) -> bool:
     def is_available(self) -> bool:
         return (
             self._state != HTTPConnectionState.CLOSED
+            and self._connection_terminated is None
             and not self._connection_error
             and not self._used_all_stream_ids
             and not (

tests/_async/test_connection_pool.py

@@ -451,6 +451,96 @@ async def trace(name, kwargs):
     ]
 
 
+@pytest.mark.anyio
+async def test_connection_pool_drops_stale_available_connection():
+    """
+    If a connection claims to be available but then refuses a request,
+    the pool should not keep assigning requests to that stale connection.
+    """
+
+    class StaleConnection:
+        def __init__(self) -> None:
+            self.closed = False
+
+        async def handle_async_request(self, request):
+            raise httpcore.ConnectionNotAvailable()
+
+        def can_handle_request(self, origin):
+            return True
+
+        def is_available(self):
+            return True
+
+        def has_expired(self):
+            return False
+
+        def is_idle(self):
+            return True
+
+        def is_closed(self):
+            return False
+
+        async def aclose(self):
+            self.closed = True
+
+        def info(self):
+            return "STALE"
+
+    class SuccessConnection:
+        def __init__(self) -> None:
+            self.closed = False
+
+        async def handle_async_request(self, request):
+            async def content() -> typing.AsyncIterator[bytes]:
+                yield b"ok"
+
+            return httpcore.Response(200, content=content())
+
+        def can_handle_request(self, origin):
+            return True
+
+        def is_available(self):
+            return True
+
+        def has_expired(self):
+            return False
+
+        def is_idle(self):
+            return True
+
+        def is_closed(self):
+            return False
+
+        async def aclose(self):
+            self.closed = True
+
+        def info(self):
+            return "OK"
+
+    class Pool(httpcore.AsyncConnectionPool):
+        def __init__(self) -> None:
+            super().__init__()
+            self.stale_connection = StaleConnection()
+            self.success_connection = SuccessConnection()
+            self._created = 0
+
+        def create_connection(self, origin):
+            self._created += 1
+            if self._created == 1:
+                return self.stale_connection
+            return self.success_connection
+
+    pool = Pool()
+    async with pool:
+        response = await pool.request("GET", "https://example.com/")
+
+        assert response.status == 200
+        assert response.content == b"ok"
+        assert pool.stale_connection.closed
+        assert len(pool.connections) == 1
+        assert pool.connections[0] is pool.success_connection
+
+
 @pytest.mark.anyio
 async def test_connection_pool_with_immediate_expiry():
     """

tests/_sync/test_connection_pool.py

@@ -451,6 +451,92 @@ def trace(name, kwargs):
     ]
 
 
+def test_connection_pool_drops_stale_available_connection():
+    """
+    If a connection claims to be available but then refuses a request,
+    the pool should not keep assigning requests to that stale connection.
+    """
+
+    class StaleConnection:
+        def __init__(self) -> None:
+            self.closed = False
+
+        def handle_request(self, request):
+            raise httpcore.ConnectionNotAvailable()
+
+        def can_handle_request(self, origin):
+            return True
+
+        def is_available(self):
+            return True
+
+        def has_expired(self):
+            return False
+
+        def is_idle(self):
+            return True
+
+        def is_closed(self):
+            return False
+
+        def close(self):
+            self.closed = True
+
+        def info(self):
+            return "STALE"
+
+    class SuccessConnection:
+        def __init__(self) -> None:
+            self.closed = False
+
+        def handle_request(self, request):
+            return httpcore.Response(200, content=[b"ok"])
+
+        def can_handle_request(self, origin):
+            return True
+
+        def is_available(self):
+            return True
+
+        def has_expired(self):
+            return False
+
+        def is_idle(self):
+            return True
+
+        def is_closed(self):
+            return False
+
+        def close(self):
+            self.closed = True
+
+        def info(self):
+            return "OK"
+
+    class Pool(httpcore.ConnectionPool):
+        def __init__(self) -> None:
+            super().__init__()
+            self.stale_connection = StaleConnection()
+            self.success_connection = SuccessConnection()
+            self._created = 0
+
+        def create_connection(self, origin):
+            self._created += 1
+            if self._created == 1:
+                return self.stale_connection
+            return self.success_connection
+
+    pool = Pool()
+    with pool:
+        response = pool.request("GET", "https://example.com/")
+
+        assert response.status == 200
+        assert response.content == b"ok"
+        assert pool.stale_connection.closed
+        assert len(pool.connections) == 1
+        assert pool.connections[0] is pool.success_connection
+
+
 
 def test_connection_pool_with_immediate_expiry():
     """