Fix race condition on connections

aio-libs · Aug 27, 2020 · f1b30cc · f1b30cc
1 parent 59a8c64
commit f1b30cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/aiohttp/connector.py b/aiohttp/connector.py
@@ -456,8 +456,9 @@ async def connect(self, req: 'ClientRequest',
         key = req.connection_key
         available = self._available_connections(key)
 
-        # Wait if there are no available connections.
-        if available <= 0:
+        # Wait if there are no available connections or if there are/were
+        # waiters (i.e. don't steal connection from a waiter about to wake up)
+        if available <= 0 or key in self._waiters:
             fut = self._loop.create_future()
 
             # This connection will now count towards the limit.

diff --git a/tests/test_connector.py b/tests/test_connector.py
@@ -1663,7 +1663,6 @@ def check_with_exc(err):
     check_with_exc(asyncio.TimeoutError())
 
 
-@pytest.mark.xfail
 async def test_connect_with_limit_concurrent(loop) -> None:
     proto = create_mocked_conn(loop)
     proto.should_close = False